From 5921e65d838b39dc031fde6f524d395cba632eda Mon Sep 17 00:00:00 2001
From: Dan Smith <dsmith@danplanet.com>
Date: Sat, 13 Feb 2016 23:10:08 +0000
Subject: [PATCH] Allow specifying location and/or thermostat for Honeywell US

This lets you optionally only add thermostats by location or
specific device id, instead of all the thermostats in your
account. This would be helpful if you have two devices in different
houses (i.e vacation home), etc.
---
 .../components/thermostat/honeywell.py        |  7 ++-
 tests/components/thermostat/test_honeywell.py | 63 +++++++++++++++++++
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/thermostat/honeywell.py b/homeassistant/components/thermostat/honeywell.py
index 8d72db0a288..4baa8e5c9ed 100644
--- a/homeassistant/components/thermostat/honeywell.py
+++ b/homeassistant/components/thermostat/honeywell.py
@@ -61,9 +61,14 @@ def _setup_us(username, password, config, add_devices):
         _LOGGER.error('Failed to initialize honeywell client: %s', str(ex))
         return False
 
+    dev_id = config.get('thermostat')
+    loc_id = config.get('location')
+
     add_devices([HoneywellUSThermostat(client, device)
                  for location in client.locations_by_id.values()
-                 for device in location.devices_by_id.values()])
+                 for device in location.devices_by_id.values()
+                 if ((not loc_id or location.locationid == loc_id) and
+                     (not dev_id or device.deviceid == dev_id))])
     return True
 
 
diff --git a/tests/components/thermostat/test_honeywell.py b/tests/components/thermostat/test_honeywell.py
index 0edc479d59a..5cb063846a5 100644
--- a/tests/components/thermostat/test_honeywell.py
+++ b/tests/components/thermostat/test_honeywell.py
@@ -67,6 +67,69 @@ class TestHoneywell(unittest.TestCase):
         self.assertFalse(result)
         self.assertFalse(add_devices.called)
 
+    @mock.patch('somecomfort.SomeComfort')
+    @mock.patch('homeassistant.components.thermostat.'
+                'honeywell.HoneywellUSThermostat')
+    def _test_us_filtered_devices(self, mock_ht, mock_sc, loc=None, dev=None):
+        config = {
+            CONF_USERNAME: 'user',
+            CONF_PASSWORD: 'pass',
+            'region': 'us',
+            'location': loc,
+            'thermostat': dev,
+        }
+        locations = {
+            1: mock.MagicMock(locationid=mock.sentinel.loc1,
+                              devices_by_id={
+                                  11: mock.MagicMock(
+                                      deviceid=mock.sentinel.loc1dev1),
+                                  12: mock.MagicMock(
+                                      deviceid=mock.sentinel.loc1dev2),
+                              }),
+            2: mock.MagicMock(locationid=mock.sentinel.loc2,
+                              devices_by_id={
+                                  21: mock.MagicMock(
+                                      deviceid=mock.sentinel.loc2dev1),
+                              }),
+            3: mock.MagicMock(locationid=mock.sentinel.loc3,
+                              devices_by_id={
+                                  31: mock.MagicMock(
+                                      deviceid=mock.sentinel.loc3dev1),
+                              }),
+        }
+        mock_sc.return_value = mock.MagicMock(locations_by_id=locations)
+        hass = mock.MagicMock()
+        add_devices = mock.MagicMock()
+        self.assertEqual(True,
+                         honeywell.setup_platform(hass, config, add_devices))
+
+        return mock_ht.call_args_list, mock_sc
+
+    def test_us_filtered_thermostat_1(self):
+        result, client = self._test_us_filtered_devices(
+            dev=mock.sentinel.loc1dev1)
+        devices = [x[0][1].deviceid for x in result]
+        self.assertEqual([mock.sentinel.loc1dev1], devices)
+
+    def test_us_filtered_thermostat_2(self):
+        result, client = self._test_us_filtered_devices(
+            dev=mock.sentinel.loc2dev1)
+        devices = [x[0][1].deviceid for x in result]
+        self.assertEqual([mock.sentinel.loc2dev1], devices)
+
+    def test_us_filtered_location_1(self):
+        result, client = self._test_us_filtered_devices(
+            loc=mock.sentinel.loc1)
+        devices = [x[0][1].deviceid for x in result]
+        self.assertEqual([mock.sentinel.loc1dev1,
+                          mock.sentinel.loc1dev2], devices)
+
+    def test_us_filtered_location_2(self):
+        result, client = self._test_us_filtered_devices(
+            loc=mock.sentinel.loc2)
+        devices = [x[0][1].deviceid for x in result]
+        self.assertEqual([mock.sentinel.loc2dev1], devices)
+
 
 class TestHoneywellUS(unittest.TestCase):
     def setup_method(self, method):