HTTP more robust and increased test coverage

This commit is contained in:
Paulus Schoutsen committed 2014-11-28 22:27:44 -08:00
1 parent 014abdba39
commit a4eb975b59
4 files changed
+232 -88

No files matched your search

+46 -16
View File
@@ -34,6 +34,7 @@ URL_API_EVENT_FORWARD = "/api/event_forwarding"
METHOD_GET = "get"
METHOD_POST = "post"
METHOD_DELETE = "delete"
_LOGGER = logging.getLogger(__name__)
@@ -94,6 +95,10 @@ class API(object):
_LOGGER.exception(error)
raise ha.HomeAssistantError(error)
def __repr__(self):
return "API({}, {}, {})".format(
self.host, self.api_password, self.port)
class HomeAssistant(ha.HomeAssistant):
""" Home Assistant that forwards work. """
@@ -122,19 +127,23 @@ class HomeAssistant(ha.HomeAssistant):
import random
# pylint: disable=too-many-format-args
random_password = '%030x'.format(random.randrange(16**30))
random_password = '{:30}'.format(random.randrange(16**30))
http.setup(
self, {http.DOMAIN: {http.CONF_API_PASSWORD: random_password}})
ha.Timer(self)
# Setup that events from remote_api get forwarded to local_api
connect_remote_events(self.remote_api, self.local_api)
self.bus.fire(ha.EVENT_HOMEASSISTANT_START,
origin=ha.EventOrigin.remote)
# Setup that events from remote_api get forwarded to local_api
# Do this after we fire START, otherwise HTTP is not started
if not connect_remote_events(self.remote_api, self.local_api):
raise ha.HomeAssistantError((
'Could not setup event forwarding from api {} to '
'local api {}').format(self.remote_api, self.local_api))
def stop(self):
""" Stops Home Assistant and shuts down all threads. """
_LOGGER.info("Stopping")
@@ -289,30 +298,51 @@ def validate_api(api):
def connect_remote_events(from_api, to_api):
""" Sets up from_api to forward all events to to_api. """
data = {'host': to_api.host, 'api_password': to_api.api_password}
if to_api.port is not None:
data['port'] = to_api.port
data = {
'host': to_api.host,
'api_password': to_api.api_password,
'port': to_api.port
}
try:
from_api(METHOD_POST, URL_API_EVENT_FORWARD, data)
req = from_api(METHOD_POST, URL_API_EVENT_FORWARD, data)
if req.status_code == 200:
return True
else:
_LOGGER.error(
"Error settign up event forwarding: %s - %s",
req.status_code, req.text)
return False
except ha.HomeAssistantError:
pass
_LOGGER.exception("Error setting up event forwarding")
return False
def disconnect_remote_events(from_api, to_api):
""" Disconnects forwarding events from from_api to to_api. """
data = {'host': to_api.host, '_METHOD': 'DELETE'}
if to_api.port is not None:
data['port'] = to_api.port
data = {
'host': to_api.host,
'port': to_api.port
}
try:
from_api(METHOD_POST, URL_API_EVENT_FORWARD, data)
req = from_api(METHOD_DELETE, URL_API_EVENT_FORWARD, data)
if req.status_code == 200:
return True
else:
_LOGGER.error(
"Error removing event forwarding: %s - %s",
req.status_code, req.text)
return False
except ha.HomeAssistantError:
pass
_LOGGER.exception("Error removing an event forwarder")
return False
def get_event_listeners(api):