Adding configration to disable ip address as a requirement Fixes: #13399

homeassistant/components/device_tracker/asuswrt.py

@@ -25,6 +25,7 @@
 
 CONF_PUB_KEY = 'pub_key'
 CONF_SSH_KEY = 'ssh_key'
+CONF_REQUIRE_IP = 'require_ip'
 DEFAULT_SSH_PORT = 22
 SECRET_GROUP = 'Password or SSH Key'
 
@@ -36,6 +37,7 @@
         vol.Optional(CONF_PROTOCOL, default='ssh'): vol.In(['ssh', 'telnet']),
         vol.Optional(CONF_MODE, default='router'): vol.In(['router', 'ap']),
         vol.Optional(CONF_PORT, default=DEFAULT_SSH_PORT): cv.port,
+        vol.Optional(CONF_REQUIRE_IP, default=True): cv.boolean,
         vol.Exclusive(CONF_PASSWORD, SECRET_GROUP): cv.string,
         vol.Exclusive(CONF_SSH_KEY, SECRET_GROUP): cv.isfile,
         vol.Exclusive(CONF_PUB_KEY, SECRET_GROUP): cv.isfile
@@ -115,6 +117,7 @@ def __init__(self, config):
         self.protocol = config[CONF_PROTOCOL]
         self.mode = config[CONF_MODE]
         self.port = config[CONF_PORT]
+        self.require_ip = config[CONF_REQUIRE_IP]
 
         if self.protocol == 'ssh':
             self.connection = SshConnection(
@@ -172,7 +175,7 @@ def get_asuswrt_data(self):
 
         ret_devices = {}
         for key in devices:
-            if self.mode == 'ap' or devices[key].ip is not None:
+            if not self.require_ip or devices[key].ip is not None:
                 ret_devices[key] = devices[key]
         return ret_devices
 

tests/components/device_tracker/test_asuswrt.py

@@ -15,7 +15,7 @@
 from homeassistant.components.device_tracker.asuswrt import (
     CONF_PROTOCOL, CONF_MODE, CONF_PUB_KEY, DOMAIN, _ARP_REGEX,
     CONF_PORT, PLATFORM_SCHEMA, Device, get_scanner, AsusWrtDeviceScanner,
-    _parse_lines, SshConnection, TelnetConnection)
+    _parse_lines, SshConnection, TelnetConnection, CONF_REQUIRE_IP)
 from homeassistant.const import (CONF_PLATFORM, CONF_PASSWORD, CONF_USERNAME,
                                  CONF_HOST)
 
@@ -105,6 +105,15 @@
         mac='08:09:10:11:12:14', ip='123.123.123.126', name=None)
 }
 
+WAKE_DEVICES_NO_IP = {
+    '01:02:03:04:06:08': Device(
+        mac='01:02:03:04:06:08', ip='123.123.123.125', name=None),
+    '08:09:10:11:12:14': Device(
+        mac='08:09:10:11:12:14', ip='123.123.123.126', name=None),
+    '08:09:10:11:12:15': Device(
+        mac='08:09:10:11:12:15', ip=None, name=None)
+}
+
 
 def setup_module():
     """Setup the test module."""
@@ -411,6 +420,21 @@ def test_get_asuswrt_data_ap(self):
         scanner._get_leases.return_value = LEASES_DEVICES
         self.assertEqual(WAKE_DEVICES_AP, scanner.get_asuswrt_data())
 
+    def test_get_asuswrt_data_no_ip(self):
+        """Test for get asuswrt_data and not requiring ip."""
+        conf = VALID_CONFIG_ROUTER_SSH.copy()[DOMAIN]
+        conf[CONF_REQUIRE_IP] = False
+        scanner = AsusWrtDeviceScanner(conf)
+        scanner._get_wl = mock.Mock()
+        scanner._get_arp = mock.Mock()
+        scanner._get_neigh = mock.Mock()
+        scanner._get_leases = mock.Mock()
+        scanner._get_wl.return_value = WL_DEVICES
+        scanner._get_arp.return_value = ARP_DEVICES
+        scanner._get_neigh.return_value = NEIGH_DEVICES
+        scanner._get_leases.return_value = LEASES_DEVICES
+        self.assertEqual(WAKE_DEVICES_NO_IP, scanner.get_asuswrt_data())
+
     def test_update_info(self):
         """Test for update info."""
         scanner = get_scanner(self.hass, VALID_CONFIG_ROUTER_SSH)