From c019d1f3c5dadd522408fdd265692653b0cd1967 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Mon, 17 Apr 2017 18:12:58 +0200
Subject: [PATCH] Fix api function names

---
 hassio/addons/__init__.py | 14 +++++++-------
 hassio/api/addons.py      | 16 ++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/hassio/addons/__init__.py b/hassio/addons/__init__.py
index 0c026be10..96255a648 100644
--- a/hassio/addons/__init__.py
+++ b/hassio/addons/__init__.py
@@ -56,13 +56,13 @@ class AddonManager(AddonsData):
         tasks = []
 
         for addon in boot_list:
-            tasks.append(self.loop.create_task(self.start_addon(addon)))
+            tasks.append(self.loop.create_task(self.start(addon)))
 
         _LOGGER.info("Startup %s run %d addons", start_type, len(tasks))
         if tasks:
             await asyncio.wait(tasks, loop=self.loop)
 
-    async def install_addon(self, addon, version=None):
+    async def install(self, addon, version=None):
         """Install a addon."""
         if not self.exists_addon(addon):
             _LOGGER.error("Addon %s not exists for install", addon)
@@ -88,7 +88,7 @@ class AddonManager(AddonsData):
         self.set_install_addon(addon, version)
         return True
 
-    async def uninstall_addon(self, addon):
+    async def uninstall(self, addon):
         """Remove a addon."""
         if not self.is_installed(addon):
             _LOGGER.error("Addon %s is already uninstalled", addon)
@@ -110,7 +110,7 @@ class AddonManager(AddonsData):
         self.set_uninstall_addon(addon)
         return True
 
-    async def state_addon(self, addon):
+    async def state(self, addon):
         """Return running state of addon."""
         if addon not in self.dockers:
             _LOGGER.error("No docker found for addon %s", addon)
@@ -120,7 +120,7 @@ class AddonManager(AddonsData):
             return STATE_STARTED
         return STATE_STOPPED
 
-    async def start_addon(self, addon):
+    async def start(self, addon):
         """Set options and start addon."""
         if addon not in self.dockers:
             _LOGGER.error("No docker found for addon %s", addon)
@@ -132,7 +132,7 @@ class AddonManager(AddonsData):
 
         return await self.dockers[addon].run()
 
-    async def stop_addon(self, addon):
+    async def stop(self, addon):
         """Stop addon."""
         if addon not in self.dockers:
             _LOGGER.error("No docker found for addon %s", addon)
@@ -140,7 +140,7 @@ class AddonManager(AddonsData):
 
         return await self.dockers[addon].stop()
 
-    async def update_addon(self, addon, version=None):
+    async def update(self, addon, version=None):
         """Update addon."""
         if self.is_installed(addon):
             _LOGGER.error("Addon %s is not installed", addon)
diff --git a/hassio/api/addons.py b/hassio/api/addons.py
index 748b1639f..74a5bee59 100644
--- a/hassio/api/addons.py
+++ b/hassio/api/addons.py
@@ -45,7 +45,7 @@ class APIAddons(object):
         info = {
             ATTR_VERSION: self.addons.version_installed(addon),
             ATTR_CURRENT: self.addons.get_version(addon),
-            ATTR_STATE: await self.addons.state_addon(addon),
+            ATTR_STATE: await self.addons.state(addon),
             ATTR_BOOT: self.addons.get_boot(addon),
             ATTR_OPTIONS: self.addons.get_options(addon),
         }
@@ -70,7 +70,7 @@ class APIAddons(object):
             ATTR_VERSION, self.addons.get_version(addon))
 
         return await asyncio.shield(
-            self.addons.addon_install(addon, version), loop=self.loop)
+            self.addons.install(addon, version), loop=self.loop)
 
     @api_process
     async def uninstall(self, request):
@@ -78,29 +78,29 @@ class APIAddons(object):
         addon = self._extract_addon(request)
 
         return await asyncio.shield(
-            self.addons.addon_uninstall(addon), loop=self.loop)
+            self.addons.uninstall(addon), loop=self.loop)
 
     @api_process
     async def start(self, request):
         """Start addon."""
         addon = self._extract_addon(request)
 
-        if await self.addons.state_addon(addon) == STATE_STARTED:
+        if await self.addons.state(addon) == STATE_STARTED:
             raise RuntimeError("Addon is already running")
 
         return await asyncio.shield(
-            self.addons.addon_start(addon), loop=self.loop)
+            self.addons.start(addon), loop=self.loop)
 
     @api_process
     async def stop(self, request):
         """Stop addon."""
         addon = self._extract_addon(request)
 
-        if await self.addons.state_addon(addon) == STATE_STOPPED:
+        if await self.addons.state(addon) == STATE_STOPPED:
             raise RuntimeError("Addon is already stoped")
 
         return await asyncio.shield(
-            self.addons.addon_stop(addon), loop=self.loop)
+            self.addons.stop(addon), loop=self.loop)
 
     @api_process
     async def update(self, request):
@@ -114,4 +114,4 @@ class APIAddons(object):
             raise RuntimeError("Version is already in use")
 
         return await asyncio.shield(
-            self.addons.addon_update(addon, version), loop=self.loop)
+            self.addons.update(addon, version), loop=self.loop)