diff --git a/homeassistant/components/zwave_js/__init__.py b/homeassistant/components/zwave_js/__init__.py index f6edb2f4596..530a8022233 100644 --- a/homeassistant/components/zwave_js/__init__.py +++ b/homeassistant/components/zwave_js/__init__.py @@ -21,6 +21,7 @@ from homeassistant.helpers.dispatcher import async_dispatcher_send from .api import async_register_api from .const import ( + ADDON_SLUG, ATTR_COMMAND_CLASS, ATTR_COMMAND_CLASS_NAME, ATTR_DEVICE_ID, @@ -333,11 +334,11 @@ async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None: return try: - await hass.components.hassio.async_stop_addon("core_zwave_js") + await hass.components.hassio.async_stop_addon(ADDON_SLUG) except HassioAPIError as err: LOGGER.error("Failed to stop the Z-Wave JS add-on: %s", err) return try: - await hass.components.hassio.async_uninstall_addon("core_zwave_js") + await hass.components.hassio.async_uninstall_addon(ADDON_SLUG) except HassioAPIError as err: LOGGER.error("Failed to uninstall the Z-Wave JS add-on: %s", err) diff --git a/homeassistant/components/zwave_js/config_flow.py b/homeassistant/components/zwave_js/config_flow.py index b18e28419dd..ec74acf9886 100644 --- a/homeassistant/components/zwave_js/config_flow.py +++ b/homeassistant/components/zwave_js/config_flow.py @@ -14,6 +14,7 @@ from homeassistant.data_entry_flow import AbortFlow from homeassistant.helpers.aiohttp_client import async_get_clientsession from .const import ( # pylint:disable=unused-import + ADDON_SLUG, CONF_INTEGRATION_CREATED_ADDON, CONF_USE_ADDON, DOMAIN, @@ -248,7 +249,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): await self._async_set_addon_config(new_addon_config) try: - await self.hass.components.hassio.async_start_addon("core_zwave_js") + await self.hass.components.hassio.async_start_addon(ADDON_SLUG) except self.hass.components.hassio.HassioAPIError as err: _LOGGER.error("Failed to start Z-Wave JS add-on: %s", err) errors["base"] = "addon_start_failed" @@ -294,7 +295,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): """Return and cache Z-Wave JS add-on info.""" try: addon_info: dict = await self.hass.components.hassio.async_get_addon_info( - "core_zwave_js" + ADDON_SLUG ) except self.hass.components.hassio.HassioAPIError as err: _LOGGER.error("Failed to get Z-Wave JS add-on info: %s", err) @@ -322,7 +323,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): options = {"options": config} try: await self.hass.components.hassio.async_set_addon_options( - "core_zwave_js", options + ADDON_SLUG, options ) except self.hass.components.hassio.HassioAPIError as err: _LOGGER.error("Failed to set Z-Wave JS add-on config: %s", err) @@ -331,7 +332,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): async def _async_install_addon(self) -> None: """Install the Z-Wave JS add-on.""" try: - await self.hass.components.hassio.async_install_addon("core_zwave_js") + await self.hass.components.hassio.async_install_addon(ADDON_SLUG) finally: # Continue the flow after show progress when the task is done. self.hass.async_create_task( @@ -343,7 +344,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): try: discovery_info: dict = ( await self.hass.components.hassio.async_get_addon_discovery_info( - "core_zwave_js" + ADDON_SLUG ) ) except self.hass.components.hassio.HassioAPIError as err: diff --git a/homeassistant/components/zwave_js/const.py b/homeassistant/components/zwave_js/const.py index 9905eba0693..5eb537c0d4e 100644 --- a/homeassistant/components/zwave_js/const.py +++ b/homeassistant/components/zwave_js/const.py @@ -32,3 +32,5 @@ ATTR_DEVICE_ID = "device_id" ATTR_PROPERTY_NAME = "property_name" ATTR_PROPERTY_KEY_NAME = "property_key_name" ATTR_PARAMETERS = "parameters" + +ADDON_SLUG = "core_zwave_js"