removed DATA_CLIENT from DOMAIN

This commit is contained in:
Tomaae 2022-02-18 08:06:10 +01:00
parent e62a711bfe
commit 7d76af5b79
7 changed files with 10 additions and 16 deletions

View file

@ -8,7 +8,6 @@ from homeassistant.exceptions import ConfigEntryNotReady
from .const import (
PLATFORMS,
DOMAIN,
DATA_CLIENT,
RUN_SCRIPT_COMMAND,
)
from .mikrotik_controller import MikrotikControllerData
@ -24,7 +23,6 @@ SCRIPT_SCHEMA = vol.Schema(
async def async_setup(hass, _config):
"""Set up configured Mikrotik Controller."""
hass.data[DOMAIN] = {}
hass.data[DOMAIN][DATA_CLIENT] = {}
return True
@ -52,7 +50,7 @@ async def async_setup_entry(hass, config_entry) -> bool:
raise ConfigEntryNotReady()
await controller.async_init()
hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id] = controller
hass.data[DOMAIN][config_entry.entry_id] = controller
hass.config_entries.async_setup_platforms(config_entry, PLATFORMS)
config_entry.async_on_unload(config_entry.add_update_listener(update_listener))
@ -73,9 +71,9 @@ async def async_unload_entry(hass, config_entry) -> bool:
config_entry, PLATFORMS
)
if unload_ok:
controller = hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id]
controller = hass.data[DOMAIN][config_entry.entry_id]
await controller.async_reset()
hass.services.async_remove(DOMAIN, RUN_SCRIPT_COMMAND)
hass.data[DOMAIN][DATA_CLIENT].pop(config_entry.entry_id)
hass.data[DOMAIN].pop(config_entry.entry_id)
return unload_ok

View file

@ -17,7 +17,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
from .helper import format_attribute
from .const import (
DOMAIN,
DATA_CLIENT,
ATTRIBUTION,
CONF_SENSOR_PPP,
DEFAULT_SENSOR_PPP,
@ -40,7 +39,7 @@ _LOGGER = logging.getLogger(__name__)
async def async_setup_entry(hass, config_entry, async_add_entities):
"""Set up device tracker for Mikrotik Router component."""
inst = config_entry.data[CONF_NAME]
mikrotik_controller = hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id]
mikrotik_controller = hass.data[DOMAIN][config_entry.entry_id]
sensors = {}
@callback

View file

@ -8,7 +8,7 @@ from homeassistant.core import callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect
from homeassistant.helpers.restore_state import RestoreEntity
from .helper import format_attribute
from .const import DOMAIN, DATA_CLIENT, ATTRIBUTION
from .const import DOMAIN, ATTRIBUTION
_LOGGER = logging.getLogger(__name__)
@ -24,7 +24,7 @@ DEVICE_ATTRIBUTES_SCRIPT = [
async def async_setup_entry(hass, config_entry, async_add_entities):
"""Set up buttons for Mikrotik Router component."""
inst = config_entry.data[CONF_NAME]
mikrotik_controller = hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id]
mikrotik_controller = hass.data[DOMAIN][config_entry.entry_id]
buttons = {}
@callback

View file

@ -10,7 +10,6 @@ PLATFORMS = [
]
DOMAIN = "mikrotik_router"
DEFAULT_NAME = "Mikrotik Router"
DATA_CLIENT = "client"
ATTRIBUTION = "Data provided by Mikrotik"
RUN_SCRIPT_COMMAND = "run_script"

View file

@ -20,7 +20,6 @@ from homeassistant.util.dt import get_age, utcnow
from .helper import format_attribute, format_value
from .const import (
DOMAIN,
DATA_CLIENT,
ATTRIBUTION,
CONF_TRACK_HOSTS,
DEFAULT_TRACK_HOSTS,
@ -41,7 +40,7 @@ _LOGGER = logging.getLogger(__name__)
async def async_setup_entry(hass, config_entry, async_add_entities):
"""Set up device tracker for Mikrotik Router component."""
inst = config_entry.data[CONF_NAME]
mikrotik_controller = hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id]
mikrotik_controller = hass.data[DOMAIN][config_entry.entry_id]
trackers = {}
@callback

View file

@ -17,7 +17,6 @@ from .const import (
CONF_SENSOR_PORT_TRAFFIC,
DEFAULT_SENSOR_PORT_TRAFFIC,
DOMAIN,
DATA_CLIENT,
ATTRIBUTION,
)
from .sensor_types import (
@ -36,7 +35,7 @@ _LOGGER = logging.getLogger(__name__)
async def async_setup_entry(hass, config_entry, async_add_entities):
"""Set up device tracker for Mikrotik Router component."""
inst = config_entry.data[CONF_NAME]
mikrotik_controller = hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id]
mikrotik_controller = hass.data[DOMAIN][config_entry.entry_id]
sensors = {}
@callback

View file

@ -10,7 +10,7 @@ from homeassistant.helpers.entity import DeviceInfo
from homeassistant.helpers.dispatcher import async_dispatcher_connect
from homeassistant.helpers.restore_state import RestoreEntity
from .helper import format_attribute
from .const import DOMAIN, DATA_CLIENT, ATTRIBUTION
from .const import DOMAIN, ATTRIBUTION
from .switch_types import (
MikrotikSwitchEntityDescription,
SWITCH_TYPES,
@ -27,7 +27,7 @@ _LOGGER = logging.getLogger(__name__)
async def async_setup_entry(hass, config_entry, async_add_entities):
"""Set up switches for Mikrotik Router component."""
inst = config_entry.data[CONF_NAME]
mikrotik_controller = hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id]
mikrotik_controller = hass.data[DOMAIN][config_entry.entry_id]
switches = {}
@callback