Use core constants for xiaomi_aqara (#46551)

This commit is contained in:
tkdrob 2021-02-15 18:14:27 -05:00 committed by GitHub
parent ea47e5d8af
commit 2a7d2868be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 10 deletions

View File

@ -13,6 +13,7 @@ from homeassistant.const import (
CONF_HOST, CONF_HOST,
CONF_MAC, CONF_MAC,
CONF_PORT, CONF_PORT,
CONF_PROTOCOL,
EVENT_HOMEASSISTANT_STOP, EVENT_HOMEASSISTANT_STOP,
) )
from homeassistant.core import callback from homeassistant.core import callback
@ -26,7 +27,6 @@ from homeassistant.util.dt import utcnow
from .const import ( from .const import (
CONF_INTERFACE, CONF_INTERFACE,
CONF_KEY, CONF_KEY,
CONF_PROTOCOL,
CONF_SID, CONF_SID,
DEFAULT_DISCOVERY_RETRY, DEFAULT_DISCOVERY_RETRY,
DOMAIN, DOMAIN,

View File

@ -6,7 +6,7 @@ import voluptuous as vol
from xiaomi_gateway import MULTICAST_PORT, XiaomiGateway, XiaomiGatewayDiscovery from xiaomi_gateway import MULTICAST_PORT, XiaomiGateway, XiaomiGatewayDiscovery
from homeassistant import config_entries from homeassistant import config_entries
from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME, CONF_PORT from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME, CONF_PORT, CONF_PROTOCOL
from homeassistant.core import callback from homeassistant.core import callback
from homeassistant.helpers.device_registry import format_mac from homeassistant.helpers.device_registry import format_mac
@ -14,7 +14,6 @@ from homeassistant.helpers.device_registry import format_mac
from .const import ( from .const import (
CONF_INTERFACE, CONF_INTERFACE,
CONF_KEY, CONF_KEY,
CONF_PROTOCOL,
CONF_SID, CONF_SID,
DEFAULT_DISCOVERY_RETRY, DEFAULT_DISCOVERY_RETRY,
DOMAIN, DOMAIN,

View File

@ -9,7 +9,6 @@ ZEROCONF_GATEWAY = "lumi-gateway"
ZEROCONF_ACPARTNER = "lumi-acpartner" ZEROCONF_ACPARTNER = "lumi-acpartner"
CONF_INTERFACE = "interface" CONF_INTERFACE = "interface"
CONF_PROTOCOL = "protocol"
CONF_KEY = "key" CONF_KEY = "key"
CONF_SID = "sid" CONF_SID = "sid"

View File

@ -7,7 +7,7 @@ import pytest
from homeassistant import config_entries from homeassistant import config_entries
from homeassistant.components import zeroconf from homeassistant.components import zeroconf
from homeassistant.components.xiaomi_aqara import config_flow, const from homeassistant.components.xiaomi_aqara import config_flow, const
from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME, CONF_PORT from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME, CONF_PORT, CONF_PROTOCOL
ZEROCONF_NAME = "name" ZEROCONF_NAME = "name"
ZEROCONF_PROP = "properties" ZEROCONF_PROP = "properties"
@ -107,7 +107,7 @@ async def test_config_flow_user_success(hass):
CONF_PORT: TEST_PORT, CONF_PORT: TEST_PORT,
CONF_MAC: TEST_MAC, CONF_MAC: TEST_MAC,
const.CONF_INTERFACE: config_flow.DEFAULT_INTERFACE, const.CONF_INTERFACE: config_flow.DEFAULT_INTERFACE,
const.CONF_PROTOCOL: TEST_PROTOCOL, CONF_PROTOCOL: TEST_PROTOCOL,
const.CONF_KEY: TEST_KEY, const.CONF_KEY: TEST_KEY,
const.CONF_SID: TEST_SID, const.CONF_SID: TEST_SID,
} }
@ -159,7 +159,7 @@ async def test_config_flow_user_multiple_success(hass):
CONF_PORT: TEST_PORT, CONF_PORT: TEST_PORT,
CONF_MAC: TEST_MAC, CONF_MAC: TEST_MAC,
const.CONF_INTERFACE: config_flow.DEFAULT_INTERFACE, const.CONF_INTERFACE: config_flow.DEFAULT_INTERFACE,
const.CONF_PROTOCOL: TEST_PROTOCOL, CONF_PROTOCOL: TEST_PROTOCOL,
const.CONF_KEY: TEST_KEY, const.CONF_KEY: TEST_KEY,
const.CONF_SID: TEST_SID, const.CONF_SID: TEST_SID,
} }
@ -196,7 +196,7 @@ async def test_config_flow_user_no_key_success(hass):
CONF_PORT: TEST_PORT, CONF_PORT: TEST_PORT,
CONF_MAC: TEST_MAC, CONF_MAC: TEST_MAC,
const.CONF_INTERFACE: config_flow.DEFAULT_INTERFACE, const.CONF_INTERFACE: config_flow.DEFAULT_INTERFACE,
const.CONF_PROTOCOL: TEST_PROTOCOL, CONF_PROTOCOL: TEST_PROTOCOL,
const.CONF_KEY: None, const.CONF_KEY: None,
const.CONF_SID: TEST_SID, const.CONF_SID: TEST_SID,
} }
@ -243,7 +243,7 @@ async def test_config_flow_user_host_mac_success(hass):
CONF_PORT: TEST_PORT, CONF_PORT: TEST_PORT,
CONF_MAC: TEST_MAC, CONF_MAC: TEST_MAC,
const.CONF_INTERFACE: config_flow.DEFAULT_INTERFACE, const.CONF_INTERFACE: config_flow.DEFAULT_INTERFACE,
const.CONF_PROTOCOL: TEST_PROTOCOL, CONF_PROTOCOL: TEST_PROTOCOL,
const.CONF_KEY: None, const.CONF_KEY: None,
const.CONF_SID: TEST_SID, const.CONF_SID: TEST_SID,
} }
@ -433,7 +433,7 @@ async def test_zeroconf_success(hass):
CONF_PORT: TEST_PORT, CONF_PORT: TEST_PORT,
CONF_MAC: TEST_MAC, CONF_MAC: TEST_MAC,
const.CONF_INTERFACE: config_flow.DEFAULT_INTERFACE, const.CONF_INTERFACE: config_flow.DEFAULT_INTERFACE,
const.CONF_PROTOCOL: TEST_PROTOCOL, CONF_PROTOCOL: TEST_PROTOCOL,
const.CONF_KEY: TEST_KEY, const.CONF_KEY: TEST_KEY,
const.CONF_SID: TEST_SID, const.CONF_SID: TEST_SID,
} }