Merge pull request #526 from home-assistant/dev

Release 109

API.md

@@ -227,14 +227,12 @@ return:
 ```json
 {
     "hostname": "hostname|null",
-    "features": ["shutdown", "reboot", "update", "hostname", "services"],
+    "features": ["shutdown", "reboot", "hostname", "services", "hassos"],
-    "operating_system": "Hass.io-OS XY|Ubuntu 16.4|null",
+    "operating_system": "HassOS XY|Ubuntu 16.4|null",
     "kernel": "4.15.7|null",
     "chassis": "specific|null",
-    "type": "Hass.io-OS Type|null",
     "deployment": "stable|beta|dev|null",
-    "version": "xy|null",
+    "cpe": "xy|null",
-    "last_version": "xy|null",
 }
 ```
 
@@ -246,17 +244,6 @@ return:
 }
 ```
 
-
-- POST `/host/update`
-
-Optional:
-
-```json
-{
-    "version": "VERSION"
-}
-```
-
 - POST `/host/reload`
 
 #### Services
@@ -280,6 +267,28 @@ Optional:
 
 - POST `/host/service/{unit}/reload`
 
+### HassOS
+
+- GET `/hassos/info`
+```json
+{
+    "version": "2.3",
+    "version_latest": "2.4",
+    "board": "ova|rpi"
+}
+```
+
+- POST `/hassos/update`
+```json
+{
+    "version": "optional"
+}
+```
+
+- POST `/hassos/config/sync`
+
+Load host configs from a USB stick.
+
 ### Hardware
 
 - GET `/hardware/info`
@@ -462,6 +471,7 @@ Get all available addons.
     "stdin": "bool",
     "webui": "null|http(s)://[HOST]:port/xy/zx",
     "gpio": "bool",
+    "devicetree": "bool",
     "audio": "bool",
     "audio_input": "null|0,0",
     "audio_output": "null|0,0",

hassio/addons/addon.py

@@ -25,7 +25,8 @@ from ..const import (
     ATTR_HASSIO_API, ATTR_AUDIO, ATTR_AUDIO_OUTPUT, ATTR_AUDIO_INPUT,
     ATTR_GPIO, ATTR_HOMEASSISTANT_API, ATTR_STDIN, ATTR_LEGACY, ATTR_HOST_IPC,
     ATTR_HOST_DBUS, ATTR_AUTO_UART, ATTR_DISCOVERY, ATTR_SERVICES,
-    ATTR_APPARMOR, SECURITY_PROFILE, SECURITY_DISABLE, SECURITY_DEFAULT)
+    ATTR_APPARMOR, ATTR_DEVICETREE, SECURITY_PROFILE, SECURITY_DISABLE,
+    SECURITY_DEFAULT)
 from ..coresys import CoreSysAttributes
 from ..docker.addon import DockerAddon
 from ..utils.json import write_json_file, read_json_file
@@ -354,6 +355,11 @@ class Addon(CoreSysAttributes):
         """Return True if the add-on access to gpio interface."""
         return self._mesh[ATTR_GPIO]
 
+    @property
+    def with_devicetree(self):
+        """Return True if the add-on read access to devicetree."""
+        return self._mesh[ATTR_DEVICETREE]
+
     @property
     def with_audio(self):
         """Return True if the add-on access to audio."""

hassio/addons/validate.py

@@ -18,7 +18,7 @@ from ..const import (
     ATTR_AUDIO_OUTPUT, ATTR_HASSIO_API, ATTR_BUILD_FROM, ATTR_SQUASH,
     ATTR_ARGS, ATTR_GPIO, ATTR_HOMEASSISTANT_API, ATTR_STDIN, ATTR_LEGACY,
     ATTR_HOST_DBUS, ATTR_AUTO_UART, ATTR_SERVICES, ATTR_DISCOVERY,
-    ATTR_APPARMOR)
+    ATTR_APPARMOR, ATTR_DEVICETREE)
 from ..validate import NETWORK_PORT, DOCKER_PORTS, ALSA_DEVICE
 
 _LOGGER = logging.getLogger(__name__)
@@ -111,6 +111,7 @@ SCHEMA_ADDON_CONFIG = vol.Schema({
     vol.Optional(ATTR_APPARMOR, default=True): vol.Boolean(),
     vol.Optional(ATTR_AUDIO, default=False): vol.Boolean(),
     vol.Optional(ATTR_GPIO, default=False): vol.Boolean(),
+    vol.Optional(ATTR_DEVICETREE, default=False): vol.Boolean(),
     vol.Optional(ATTR_HASSIO_API, default=False): vol.Boolean(),
     vol.Optional(ATTR_HOMEASSISTANT_API, default=False): vol.Boolean(),
     vol.Optional(ATTR_STDIN, default=False): vol.Boolean(),

hassio/api/__init__.py

@@ -9,6 +9,7 @@ from .discovery import APIDiscovery
 from .homeassistant import APIHomeAssistant
 from .hardware import APIHardware
 from .host import APIHost
+from .hassos import APIHassOS
 from .proxy import APIProxy
 from .supervisor import APISupervisor
 from .snapshots import APISnapshots
@@ -37,6 +38,7 @@ class RestAPI(CoreSysAttributes):
         """Register REST API Calls."""
         self._register_supervisor()
         self._register_host()
+        self._register_hassos()
         self._register_hardware()
         self._register_homeassistant()
         self._register_proxy()
@@ -55,7 +57,6 @@ class RestAPI(CoreSysAttributes):
             web.get('/host/info', api_host.info),
             web.post('/host/reboot', api_host.reboot),
             web.post('/host/shutdown', api_host.shutdown),
-            web.post('/host/update', api_host.update),
             web.post('/host/reload', api_host.reload),
             web.get('/host/services', api_host.services),
             web.post('/host/services/{service}/stop', api_host.service_stop),
@@ -66,6 +67,16 @@ class RestAPI(CoreSysAttributes):
                 '/host/services/{service}/reload', api_host.service_reload),
         ])
 
+    def _register_hassos(self):
+        """Register hassos function."""
+        api_hassos = APIHassOS()
+        api_hassos.coresys = self.coresys
+
+        self.webapp.add_routes([
+            web.get('/hassos/info', api_hassos.info),
+            web.post('/hassos/config/sync', api_hassos.config_sync),
+        ])
+
     def _register_hardware(self):
         """Register hardware function."""
         api_hardware = APIHardware()

hassio/api/addons.py

@@ -17,7 +17,7 @@ from ..const import (
     ATTR_CHANGELOG, ATTR_HOST_IPC, ATTR_HOST_DBUS, ATTR_LONG_DESCRIPTION,
     ATTR_CPU_PERCENT, ATTR_MEMORY_LIMIT, ATTR_MEMORY_USAGE, ATTR_NETWORK_TX,
     ATTR_NETWORK_RX, ATTR_BLK_READ, ATTR_BLK_WRITE, ATTR_ICON, ATTR_SERVICES,
-    ATTR_DISCOVERY, ATTR_APPARMOR,
+    ATTR_DISCOVERY, ATTR_APPARMOR, ATTR_DEVICETREE,
     CONTENT_TYPE_PNG, CONTENT_TYPE_BINARY, CONTENT_TYPE_TEXT)
 from ..coresys import CoreSysAttributes
 from ..validate import DOCKER_PORTS, ALSA_DEVICE
@@ -136,6 +136,7 @@ class APIAddons(CoreSysAttributes):
             ATTR_HASSIO_API: addon.access_hassio_api,
             ATTR_HOMEASSISTANT_API: addon.access_homeassistant_api,
             ATTR_GPIO: addon.with_gpio,
+            ATTR_DEVICETREE: addon.with_devicetree,
             ATTR_AUDIO: addon.with_audio,
             ATTR_AUDIO_INPUT: addon.audio_input,
             ATTR_AUDIO_OUTPUT: addon.audio_output,

hassio/api/hassos.py

@@ -0,0 +1,33 @@
+"""Init file for Hass.io hassos rest api."""
+import asyncio
+import logging
+
+import voluptuous as vol
+
+from .utils import api_process
+from ..const import ATTR_VERSION, ATTR_BOARD, ATTR_VERSION_LATEST
+from ..coresys import CoreSysAttributes
+
+_LOGGER = logging.getLogger(__name__)
+
+SCHEMA_VERSION = vol.Schema({
+    vol.Optional(ATTR_VERSION): vol.Coerce(str),
+})
+
+
+class APIHassOS(CoreSysAttributes):
+    """Handle rest api for hassos functions."""
+
+    @api_process
+    async def info(self, request):
+        """Return hassos information."""
+        return {
+            ATTR_VERSION: self.sys_hassos.version,
+            ATTR_VERSION_LATEST: self.sys_hassos.version,
+            ATTR_BOARD: self.sys_hassos.board,
+        }
+
+    @api_process
+    def config_sync(self, request):
+        """Trigger config reload on HassOS."""
+        return asyncio.shield(self.sys_hassos.config_sync())

hassio/api/host.py

@@ -6,19 +6,15 @@ import voluptuous as vol
 
 from .utils import api_process, api_validate
 from ..const import (
-    ATTR_VERSION, ATTR_LAST_VERSION, ATTR_HOSTNAME, ATTR_FEATURES, ATTR_KERNEL,
+    ATTR_HOSTNAME, ATTR_FEATURES, ATTR_KERNEL, ATTR_OPERATING_SYSTEM,
-    ATTR_TYPE, ATTR_OPERATING_SYSTEM, ATTR_CHASSIS, ATTR_DEPLOYMENT,
+    ATTR_CHASSIS, ATTR_DEPLOYMENT, ATTR_STATE, ATTR_NAME, ATTR_DESCRIPTON,
-    ATTR_STATE, ATTR_NAME, ATTR_DESCRIPTON, ATTR_SERVICES)
+    ATTR_SERVICES, ATTR_CPE)
 from ..coresys import CoreSysAttributes
 
 _LOGGER = logging.getLogger(__name__)
 
 SERVICE = 'service'
 
-SCHEMA_VERSION = vol.Schema({
-    vol.Optional(ATTR_VERSION): vol.Coerce(str),
-})
-
 SCHEMA_OPTIONS = vol.Schema({
     vol.Optional(ATTR_HOSTNAME): vol.Coerce(str),
 })
@@ -32,9 +28,7 @@ class APIHost(CoreSysAttributes):
         """Return host information."""
         return {
             ATTR_CHASSIS: self.sys_host.info.chassis,
-            ATTR_VERSION: None,
+            ATTR_CPE: self.sys_host.info.cpe,
-            ATTR_LAST_VERSION: None,
-            ATTR_TYPE: None,
             ATTR_FEATURES: self.sys_host.supperted_features,
             ATTR_HOSTNAME: self.sys_host.info.hostname,
             ATTR_OPERATING_SYSTEM: self.sys_host.info.operating_system,
@@ -67,13 +61,6 @@ class APIHost(CoreSysAttributes):
         """Reload host data."""
         return asyncio.shield(self.sys_host.reload())
 
-    @api_process
-    async def update(self, request):
-        """Update host OS."""
-        pass
-        # body = await api_validate(SCHEMA_VERSION, request)
-        # version = body.get(ATTR_VERSION, self.sys_host.last_version)
-
     @api_process
     async def services(self, request):
         """Return list of available services."""

hassio/api/panel/entrypoint.js

@@ -1 +1 @@
-!function(e){function n(n){for(var t,o,a=n[0],i=n[1],u=0,f=[];u<a.length;u++)o=a[u],r[o]&&f.push(r[o][0]),r[o]=0;for(t in i)Object.prototype.hasOwnProperty.call(i,t)&&(e[t]=i[t]);for(c&&c(n);f.length;)f.shift()()}var t={},r={6:0};function o(n){if(t[n])return t[n].exports;var r=t[n]={i:n,l:!1,exports:{}};return e[n].call(r.exports,r,r.exports,o),r.l=!0,r.exports}o.e=function(e){var n=[],t=r[e];if(0!==t)if(t)n.push(t[2]);else{var a=new Promise(function(n,o){t=r[e]=[n,o]});n.push(t[2]=a);var i=document.getElementsByTagName("head")[0],u=document.createElement("script");u.charset="utf-8",u.timeout=120,o.nc&&u.setAttribute("nonce",o.nc),u.src=function(e){return o.p+"chunk."+{0:"311036a0f4514f345e53",1:"a8e86d80be46b3b6e16d",2:"05994812bec7a524b566",3:"ff92199b0d422767d108",4:"87cffadba6f33daa568c",5:"c93f37c558ff32991708"}[e]+".js"}(e);var c=setTimeout(function(){f({type:"timeout",target:u})},12e4);function f(n){u.onerror=u.onload=null,clearTimeout(c);var t=r[e];if(0!==t){if(t){var o=n&&("load"===n.type?"missing":n.type),a=n&&n.target&&n.target.src,i=new Error("Loading chunk "+e+" failed.\n("+o+": "+a+")");i.type=o,i.request=a,t[1](i)}r[e]=void 0}}u.onerror=u.onload=f,i.appendChild(u)}return Promise.all(n)},o.m=e,o.c=t,o.d=function(e,n,t){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:t})},o.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="/api/hassio/app/",o.oe=function(e){throw console.error(e),e};var a=window.webpackJsonp=window.webpackJsonp||[],i=a.push.bind(a);a.push=n,a=a.slice();for(var u=0;u<a.length;u++)n(a[u]);var c=i;o(o.s=0)}([function(e,n,t){window.loadES5Adapter().then(function(){Promise.all([t.e(0),t.e(3)]).then(t.bind(null,1)),Promise.all([t.e(0),t.e(1),t.e(2)]).then(t.bind(null,2))})}]);
+!function(e){function n(n){for(var t,o,i=n[0],u=n[1],a=0,c=[];a<i.length;a++)o=i[a],r[o]&&c.push(r[o][0]),r[o]=0;for(t in u)Object.prototype.hasOwnProperty.call(u,t)&&(e[t]=u[t]);for(f&&f(n);c.length;)c.shift()()}var t={},r={6:0};function o(n){if(t[n])return t[n].exports;var r=t[n]={i:n,l:!1,exports:{}};return e[n].call(r.exports,r,r.exports,o),r.l=!0,r.exports}o.e=function(e){var n=[],t=r[e];if(0!==t)if(t)n.push(t[2]);else{var i=new Promise(function(n,o){t=r[e]=[n,o]});n.push(t[2]=i);var u,a=document.getElementsByTagName("head")[0],f=document.createElement("script");f.charset="utf-8",f.timeout=120,o.nc&&f.setAttribute("nonce",o.nc),f.src=function(e){return o.p+"chunk."+{0:"f3880aa331d3ef2ddf32",1:"a8e86d80be46b3b6e16d",2:"2cdff35c6685a5344cd2",3:"ff92199b0d422767d108",4:"c77b56beea1d4547ff5f",5:"c93f37c558ff32991708"}[e]+".js"}(e),u=function(n){f.onerror=f.onload=null,clearTimeout(c);var t=r[e];if(0!==t){if(t){var o=n&&("load"===n.type?"missing":n.type),i=n&&n.target&&n.target.src,u=new Error("Loading chunk "+e+" failed.\n("+o+": "+i+")");u.type=o,u.request=i,t[1](u)}r[e]=void 0}};var c=setTimeout(function(){u({type:"timeout",target:f})},12e4);f.onerror=f.onload=u,a.appendChild(f)}return Promise.all(n)},o.m=e,o.c=t,o.d=function(e,n,t){o.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:t})},o.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.t=function(e,n){if(1&n&&(e=o(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(o.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var r in e)o.d(t,r,function(n){return e[n]}.bind(null,r));return t},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="/api/hassio/app/",o.oe=function(e){throw console.error(e),e};var i=window.webpackJsonp=window.webpackJsonp||[],u=i.push.bind(i);i.push=n,i=i.slice();for(var a=0;a<i.length;a++)n(i[a]);var f=u;o(o.s=0)}([function(e,n,t){window.loadES5Adapter().then(function(){Promise.all([t.e(0),t.e(3)]).then(t.bind(null,1)),Promise.all([t.e(0),t.e(1),t.e(2)]).then(t.bind(null,2))})}]);

hassio/bootstrap.py

@@ -21,6 +21,7 @@ from .services import ServiceManager
 from .services import Discovery
 from .host import HostManager
 from .dbus import DBusManager
+from .hassos import HassOS
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -47,6 +48,7 @@ def initialize_coresys(loop):
     coresys.services = ServiceManager(coresys)
     coresys.discovery = Discovery(coresys)
     coresys.dbus = DBusManager(coresys)
+    coresys.hassos = HassOS(coresys)
 
     # bootstrap config
     initialize_system_data(coresys)

hassio/const.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 from ipaddress import ip_network
 
-HASSIO_VERSION = '108'
+HASSIO_VERSION = '109'
 
 URL_HASSIO_ADDONS = "https://github.com/home-assistant/hassio-addons"
 URL_HASSIO_VERSION = \
@@ -71,6 +71,7 @@ ATTR_SOURCE = 'source'
 ATTR_FEATURES = 'features'
 ATTR_ADDONS = 'addons'
 ATTR_VERSION = 'version'
+ATTR_VERSION_LATEST = 'version_latest'
 ATTR_AUTO_UART = 'auto_uart'
 ATTR_LAST_BOOT = 'last_boot'
 ATTR_LAST_VERSION = 'last_version'
@@ -165,6 +166,9 @@ ATTR_CRYPTO = 'crypto'
 ATTR_BRANCH = 'branch'
 ATTR_KERNEL = 'kernel'
 ATTR_APPARMOR = 'apparmor'
+ATTR_DEVICETREE = 'devicetree'
+ATTR_CPE = 'cpe'
+ATTR_BOARD = 'board'
 
 SERVICE_MQTT = 'mqtt'
 
@@ -215,6 +219,6 @@ SECURITY_DISABLE = 'disable'
 
 FEATURES_SHUTDOWN = 'shutdown'
 FEATURES_REBOOT = 'reboot'
-FEATURES_UPDATE = 'update'
+FEATURES_HASSOS = 'hassos'
 FEATURES_HOSTNAME = 'hostname'
 FEATURES_SERVICES = 'services'

hassio/core.py

@@ -32,6 +32,9 @@ class HassIO(CoreSysAttributes):
         # Load Host
         await self.sys_host.load()
 
+        # Load HassOS
+        await self.sys_hassos.load()
+
         # Load Supervisor
         await self.sys_supervisor.load()
 

hassio/coresys.py

@@ -43,6 +43,7 @@ class CoreSys:
         self._tasks = None
         self._host = None
         self._dbus = None
+        self._hassos = None
         self._services = None
         self._discovery = None
 
@@ -249,6 +250,18 @@ class CoreSys:
             raise RuntimeError("HostManager already set!")
         self._host = value
 
+    @property
+    def hassos(self):
+        """Return HassOS object."""
+        return self._hassos
+
+    @hassos.setter
+    def hassos(self, value):
+        """Set a HassOS object."""
+        if self._hassos:
+            raise RuntimeError("HassOS already set!")
+        self._hassos = value
+
     def run_in_executor(self, funct, *args):
         """Wrapper for executor pool."""
         return self._loop.run_in_executor(None, funct, *args)

hassio/docker/addon.py

@@ -201,6 +201,8 @@ class DockerAddon(DockerInterface):
                 }})
 
         # Init other hardware mappings
+
+        # GPIO support
         if self.addon.with_gpio:
             volumes.update({
                 "/sys/class/gpio": {
@@ -211,6 +213,14 @@ class DockerAddon(DockerInterface):
                 },
             })
 
+        # DeviceTree support
+        if self.addon.with_devicetree:
+            volumes.update({
+                "/sys/firmware/devicetree": {
+                    'bind': "/sys/firmware/devicetree", 'mode': 'r'
+                },
+            })
+
         # Host dbus system
         if self.addon.host_dbus:
             volumes.update({

hassio/docker/homeassistant.py

@@ -88,6 +88,9 @@ class DockerHomeAssistant(DockerInterface):
         return self.sys_docker.run_command(
             self.image,
             command,
+            privileged=True,
+            init=True,
+            devices=self.devices,
             detach=True,
             stdout=True,
             stderr=True,
@@ -96,7 +99,7 @@ class DockerHomeAssistant(DockerInterface):
             },
             volumes={
                 str(self.sys_config.path_extern_config):
-                    {'bind': '/config', 'mode': 'ro'},
+                    {'bind': '/config', 'mode': 'rw'},
                 str(self.sys_config.path_extern_ssl):
                     {'bind': '/ssl', 'mode': 'ro'},
             }

hassio/hassos.py

@@ -0,0 +1,65 @@
+"""HassOS support on supervisor."""
+import logging
+
+from cpe import CPE
+
+from .coresys import CoreSysAttributes
+from .exceptions import HassioNotSupportedError
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class HassOS(CoreSysAttributes):
+    """HassOS interface inside HassIO."""
+
+    def __init__(self, coresys):
+        """Initialize HassOS handler."""
+        self.coresys = coresys
+        self._available = False
+        self._version = None
+        self._board = None
+
+    @property
+    def available(self):
+        """Return True, if HassOS on host."""
+        return self._available
+
+    @property
+    def version(self):
+        """Return version of HassOS."""
+        return self._version
+
+    @property
+    def board(self):
+        """Return board name."""
+        return self._board
+
+    def _check_host(self):
+        """Check if HassOS is availabe."""
+        if not self.available:
+            _LOGGER.error("No HassOS availabe")
+            raise HassioNotSupportedError()
+
+    async def load(self):
+        """Load HassOS data."""
+        try:
+            assert self.sys_host.info.cpe is not None
+            cpe = CPE(self.sys_host.info.cpe)
+            assert cpe.get_product()[0] == 'hassos'
+        except (NotImplementedError, IndexError, AssertionError):
+            _LOGGER.info("Can't detect HassOS")
+            return
+
+        # Store meta data
+        self._available = True
+        self._version = cpe.get_version()[0]
+        self._board = cpe.get_target_hardware()[0]
+
+        _LOGGER.info("Detect HassOS %s on host system", self.version)
+
+    def config_sync(self):
+        """Trigger a host config reload from usb."""
+        self._check_host()
+
+        _LOGGER.info("Sync config from USB on HassOS.")
+        return self.sys_host.services.restart('hassos-config.service')

hassio/host/__init__.py

@@ -8,7 +8,8 @@ from .control import SystemControl
 from .info import InfoCenter
 from .services import ServiceManager
 from ..const import (
-    FEATURES_REBOOT, FEATURES_SHUTDOWN, FEATURES_HOSTNAME, FEATURES_SERVICES)
+    FEATURES_REBOOT, FEATURES_SHUTDOWN, FEATURES_HOSTNAME, FEATURES_SERVICES,
+    FEATURES_HASSOS)
 from ..coresys import CoreSysAttributes
 from ..exceptions import HassioError
 
@@ -67,6 +68,9 @@ class HostManager(CoreSysAttributes):
         if self.sys_dbus.hostname.is_connected:
             features.append(FEATURES_HOSTNAME)
 
+        if self.sys_hassos.available:
+            features.append(FEATURES_HASSOS)
+
         return features
 
     async def reload(self):

home-assistant-polymer

@@ -1 +1 @@
-Subproject commit 626b05454031523c1208515afe5d3012c458f32d
+Subproject commit 313a3dd2c93a85b47b78bf9ee76d81ac43d64239

setup.py

@@ -49,6 +49,7 @@ setup(
         'gitpython==2.1.10',
         'pytz==2018.4',
         'pyudev==0.21.0',
-        'pycryptodome==3.4.11'
+        'pycryptodome==3.4.11',
+        "cpe==1.2.1"
     ]
 )