Skip to content

Update to Pyunifi2.0 #6490

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
pvizeli merged 6 commits into from
Mar 10, 2017
Merged

Update to Pyunifi2.0 #6490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a8535ad
Missing comma
finish06 Mar 7, 2017
b27c096
Security opt-out, not opt-in
finish06 Mar 7, 2017
a4feace
Adjust minimal values
finish06 Mar 7, 2017
2d898d4
Update to pyUnifi 2.0
finish06 Mar 8, 2017
369649c
Merge remote-tracking branch 'refs/remotes/home-assistant/dev' into p…
finish06 Mar 8, 2017
e46f712
Updated pyUnifi
finish06 Mar 7, 2017
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
11 changes: 8 additions & 3 deletions homeassistant/components/device_tracker/unifi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@
from homeassistant.components.device_tracker import (
DOMAIN, PLATFORM_SCHEMA, DeviceScanner)
from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
from homeassistant.const import CONF_VERIFY_SSL

# Unifi package doesn't list urllib3 as a requirement
REQUIREMENTS = ['urllib3', 'pyunifi==1.3']
REQUIREMENTS = ['pyunifi==2.0']

_LOGGER = logging.getLogger(__name__)
CONF_PORT = 'port'
CONF_SITE_ID = 'site_id'
DEFAULT_VERIFY_SSL = True

NOTIFICATION_ID = 'unifi_notification'
NOTIFICATION_TITLE = 'Unifi Device Tracker Setup'
Expand All @@ -29,7 +31,8 @@
vol.Optional(CONF_SITE_ID, default='default'): cv.string,
vol.Required(CONF_PASSWORD): cv.string,
vol.Required(CONF_USERNAME): cv.string,
vol.Required(CONF_PORT, default=8443): cv.port
vol.Required(CONF_PORT, default=8443): cv.port,
vol.Optional(CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL): cv.boolean,
})


Expand All @@ -42,10 +45,12 @@ def get_scanner(hass, config):
password = config[DOMAIN].get(CONF_PASSWORD)
site_id = config[DOMAIN].get(CONF_SITE_ID)
port = config[DOMAIN].get(CONF_PORT)
verify_ssl = config[DOMAIN].get(CONF_VERIFY_SSL)

persistent_notification = loader.get_component('persistent_notification')
try:
ctrl = Controller(host, username, password, port, 'v4', site_id)
ctrl = Controller(host, username, password, port, version='v4',
site_id=site_id, ssl_verify=verify_ssl)
except urllib.error.HTTPError as ex:
_LOGGER.error('Failed to connect to Unifi: %s', ex)
persistent_notification.create(
Expand Down
5 changes: 1 addition & 4 deletions requirements_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ python-wink==1.1.1
pytrackr==0.0.5

# homeassistant.components.device_tracker.unifi
pyunifi==1.3
pyunifi==2.0

# homeassistant.components.keyboard
# pyuserinput==0.1.11
Expand Down Expand Up @@ -734,9 +734,6 @@ uber_rides==0.2.7
# homeassistant.components.sensor.ups
upsmychoice==1.0.1

# homeassistant.components.device_tracker.unifi
urllib3

# homeassistant.components.camera.uvc
uvcclient==0.10.0

Expand Down
9 changes: 6 additions & 3 deletions tests/components/device_tracker/test_unifi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from tests.common import get_test_home_assistant
from homeassistant.components.device_tracker import DOMAIN, unifi as unifi
from homeassistant.const import (CONF_HOST, CONF_USERNAME, CONF_PASSWORD,
CONF_PLATFORM)
CONF_PLATFORM, CONF_VERIFY_SSL)


class TestUnifiScanner(unittest.TestCase):
Expand Down Expand Up @@ -39,7 +39,8 @@ def test_config_minimal(self, mock_ctrl, mock_scanner):
self.assertEqual(mock_ctrl.call_count, 1)
self.assertEqual(
mock_ctrl.call_args,
mock.call('localhost', 'foo', 'password', 8443, 'v4', 'default')
mock.call('localhost', 'foo', 'password', 8443,
version='v4', site_id='default', ssl_verify=True)
)
self.assertEqual(mock_scanner.call_count, 1)
self.assertEqual(
Expand All @@ -57,6 +58,7 @@ def test_config_full(self, mock_ctrl, mock_scanner):
CONF_USERNAME: 'foo',
CONF_PASSWORD: 'password',
CONF_HOST: 'myhost',
CONF_VERIFY_SSL: False,
'port': 123,
'site_id': 'abcdef01',
})
Expand All @@ -66,7 +68,8 @@ def test_config_full(self, mock_ctrl, mock_scanner):
self.assertEqual(mock_ctrl.call_count, 1)
self.assertEqual(
mock_ctrl.call_args,
mock.call('myhost', 'foo', 'password', 123, 'v4', 'abcdef01')
mock.call('myhost', 'foo', 'password', 123,
version='v4', site_id='abcdef01', ssl_verify=False)
)
self.assertEqual(mock_scanner.call_count, 1)
self.assertEqual(
Expand Down