jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove DHCP discovery from Amazon Devices (#146476)

Browse Source
This commit is contained in:
Joost Lekkerkerker 2025-06-10 20:55:00 +02:00 committed by GitHub
parent 2f1977fa0c
commit d015dff855
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 606 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
homeassistant/components/amazon_devices/manifest.json
View File

@ -3,116 +3,6 @@
"name": "Amazon Devices",
"codeowners": ["@chemelli74"],
"config_flow": true,
"dhcp": [
{ "macaddress": "007147*" },
{ "macaddress": "00FC8B*" },
{ "macaddress": "0812A5*" },
{ "macaddress": "086AE5*" },
{ "macaddress": "08849D*" },
{ "macaddress": "089115*" },
{ "macaddress": "08A6BC*" },
{ "macaddress": "08C224*" },
{ "macaddress": "0CDC91*" },
{ "macaddress": "0CEE99*" },
{ "macaddress": "1009F9*" },
{ "macaddress": "109693*" },
{ "macaddress": "10BF67*" },
{ "macaddress": "10CE02*" },
{ "macaddress": "140AC5*" },
{ "macaddress": "149138*" },
{ "macaddress": "1848BE*" },
{ "macaddress": "1C12B0*" },
{ "macaddress": "1C4D66*" },
{ "macaddress": "1C93C4*" },
{ "macaddress": "1CFE2B*" },
{ "macaddress": "244CE3*" },
{ "macaddress": "24CE33*" },
{ "macaddress": "2873F6*" },
{ "macaddress": "2C71FF*" },
{ "macaddress": "34AFB3*" },
{ "macaddress": "34D270*" },
{ "macaddress": "38F73D*" },
{ "macaddress": "3C5CC4*" },
{ "macaddress": "3CE441*" },
{ "macaddress": "440049*" },
{ "macaddress": "40A2DB*" },
{ "macaddress": "40A9CF*" },
{ "macaddress": "40B4CD*" },
{ "macaddress": "443D54*" },
{ "macaddress": "44650D*" },
{ "macaddress": "485F2D*" },
{ "macaddress": "48785E*" },
{ "macaddress": "48B423*" },
{ "macaddress": "4C1744*" },
{ "macaddress": "4CEFC0*" },
{ "macaddress": "5007C3*" },
{ "macaddress": "50D45C*" },
{ "macaddress": "50DCE7*" },
{ "macaddress": "50F5DA*" },
{ "macaddress": "5C415A*" },
{ "macaddress": "6837E9*" },
{ "macaddress": "6854FD*" },
{ "macaddress": "689A87*" },
{ "macaddress": "68B691*" },
{ "macaddress": "68DBF5*" },
{ "macaddress": "68F63B*" },
{ "macaddress": "6C0C9A*" },
{ "macaddress": "6C5697*" },
{ "macaddress": "7458F3*" },
{ "macaddress": "74C246*" },
{ "macaddress": "74D637*" },
{ "macaddress": "74E20C*" },
{ "macaddress": "74ECB2*" },
{ "macaddress": "786C84*" },
{ "macaddress": "78A03F*" },
{ "macaddress": "7C6166*" },
{ "macaddress": "7C6305*" },
{ "macaddress": "7CD566*" },
{ "macaddress": "8871E5*" },
{ "macaddress": "901195*" },
{ "macaddress": "90235B*" },
{ "macaddress": "90A822*" },
{ "macaddress": "90F82E*" },
{ "macaddress": "943A91*" },
{ "macaddress": "98226E*" },
{ "macaddress": "98CCF3*" },
{ "macaddress": "9CC8E9*" },
{ "macaddress": "A002DC*" },
{ "macaddress": "A0D2B1*" },
{ "macaddress": "A40801*" },
{ "macaddress": "A8E621*" },
{ "macaddress": "AC416A*" },
{ "macaddress": "AC63BE*" },
{ "macaddress": "ACCCFC*" },
{ "macaddress": "B0739C*" },
{ "macaddress": "B0CFCB*" },
{ "macaddress": "B0F7C4*" },
{ "macaddress": "B85F98*" },
{ "macaddress": "C091B9*" },
{ "macaddress": "C095CF*" },
{ "macaddress": "C49500*" },
{ "macaddress": "C86C3D*" },
{ "macaddress": "CC9EA2*" },
{ "macaddress": "CCF735*" },
{ "macaddress": "DC54D7*" },
{ "macaddress": "D8BE65*" },
{ "macaddress": "D8FBD6*" },
{ "macaddress": "DC91BF*" },
{ "macaddress": "DCA0D0*" },
{ "macaddress": "E0F728*" },
{ "macaddress": "EC2BEB*" },
{ "macaddress": "EC8AC4*" },
{ "macaddress": "ECA138*" },
{ "macaddress": "F02F9E*" },
{ "macaddress": "F0272D*" },
{ "macaddress": "F0F0A4*" },
{ "macaddress": "F4032A*" },
{ "macaddress": "F854B8*" },
{ "macaddress": "FC492D*" },
{ "macaddress": "FC65DE*" },
{ "macaddress": "FCA183*" },
{ "macaddress": "FCE9D8*" }
],
"documentation": "https://www.home-assistant.io/integrations/amazon_devices",
"integration_type": "hub",
"iot_class": "cloud_polling",

4
homeassistant/components/amazon_devices/quality_scale.yaml
View File

@ -45,7 +45,9 @@ rules:
discovery-update-info:
status: exempt
comment: Network information not relevant
discovery: done
discovery:
status: exempt
comment: There are a ton of mac address ranges in use, but also by kindles which are not supported by this integration
docs-data-update: todo
docs-examples: todo
docs-known-limitations: todo

432
homeassistant/generated/dhcp.py generated
View File

@ -26,438 +26,6 @@ DHCP: Final[list[dict[str, str | bool]]] = [
"domain": "airzone",
"macaddress": "E84F25*",
},
{
"domain": "amazon_devices",
"macaddress": "007147*",
},
{
"domain": "amazon_devices",
"macaddress": "00FC8B*",
},
{
"domain": "amazon_devices",
"macaddress": "0812A5*",
},
{
"domain": "amazon_devices",
"macaddress": "086AE5*",
},
{
"domain": "amazon_devices",
"macaddress": "08849D*",
},
{
"domain": "amazon_devices",
"macaddress": "089115*",
},
{
"domain": "amazon_devices",
"macaddress": "08A6BC*",
},
{
"domain": "amazon_devices",
"macaddress": "08C224*",
},
{
"domain": "amazon_devices",
"macaddress": "0CDC91*",
},
{
"domain": "amazon_devices",
"macaddress": "0CEE99*",
},
{
"domain": "amazon_devices",
"macaddress": "1009F9*",
},
{
"domain": "amazon_devices",
"macaddress": "109693*",
},
{
"domain": "amazon_devices",
"macaddress": "10BF67*",
},
{
"domain": "amazon_devices",
"macaddress": "10CE02*",
},
{
"domain": "amazon_devices",
"macaddress": "140AC5*",
},
{
"domain": "amazon_devices",
"macaddress": "149138*",
},
{
"domain": "amazon_devices",
"macaddress": "1848BE*",
},
{
"domain": "amazon_devices",
"macaddress": "1C12B0*",
},
{
"domain": "amazon_devices",
"macaddress": "1C4D66*",
},
{
"domain": "amazon_devices",
"macaddress": "1C93C4*",
},
{
"domain": "amazon_devices",
"macaddress": "1CFE2B*",
},
{
"domain": "amazon_devices",
"macaddress": "244CE3*",
},
{
"domain": "amazon_devices",
"macaddress": "24CE33*",
},
{
"domain": "amazon_devices",
"macaddress": "2873F6*",
},
{
"domain": "amazon_devices",
"macaddress": "2C71FF*",
},
{
"domain": "amazon_devices",
"macaddress": "34AFB3*",
},
{
"domain": "amazon_devices",
"macaddress": "34D270*",
},
{
"domain": "amazon_devices",
"macaddress": "38F73D*",
},
{
"domain": "amazon_devices",
"macaddress": "3C5CC4*",
},
{
"domain": "amazon_devices",
"macaddress": "3CE441*",
},
{
"domain": "amazon_devices",
"macaddress": "440049*",
},
{
"domain": "amazon_devices",
"macaddress": "40A2DB*",
},
{
"domain": "amazon_devices",
"macaddress": "40A9CF*",
},
{
"domain": "amazon_devices",
"macaddress": "40B4CD*",
},
{
"domain": "amazon_devices",
"macaddress": "443D54*",
},
{
"domain": "amazon_devices",
"macaddress": "44650D*",
},
{
"domain": "amazon_devices",
"macaddress": "485F2D*",
},
{
"domain": "amazon_devices",
"macaddress": "48785E*",
},
{
"domain": "amazon_devices",
"macaddress": "48B423*",
},
{
"domain": "amazon_devices",
"macaddress": "4C1744*",
},
{
"domain": "amazon_devices",
"macaddress": "4CEFC0*",
},
{
"domain": "amazon_devices",
"macaddress": "5007C3*",
},
{
"domain": "amazon_devices",
"macaddress": "50D45C*",
},
{
"domain": "amazon_devices",
"macaddress": "50DCE7*",
},
{
"domain": "amazon_devices",
"macaddress": "50F5DA*",
},
{
"domain": "amazon_devices",
"macaddress": "5C415A*",
},
{
"domain": "amazon_devices",
"macaddress": "6837E9*",
},
{
"domain": "amazon_devices",
"macaddress": "6854FD*",
},
{
"domain": "amazon_devices",
"macaddress": "689A87*",
},
{
"domain": "amazon_devices",
"macaddress": "68B691*",
},
{
"domain": "amazon_devices",
"macaddress": "68DBF5*",
},
{
"domain": "amazon_devices",
"macaddress": "68F63B*",
},
{
"domain": "amazon_devices",
"macaddress": "6C0C9A*",
},
{
"domain": "amazon_devices",
"macaddress": "6C5697*",
},
{
"domain": "amazon_devices",
"macaddress": "7458F3*",
},
{
"domain": "amazon_devices",
"macaddress": "74C246*",
},
{
"domain": "amazon_devices",
"macaddress": "74D637*",
},
{
"domain": "amazon_devices",
"macaddress": "74E20C*",
},
{
"domain": "amazon_devices",
"macaddress": "74ECB2*",
},
{
"domain": "amazon_devices",
"macaddress": "786C84*",
},
{
"domain": "amazon_devices",
"macaddress": "78A03F*",
},
{
"domain": "amazon_devices",
"macaddress": "7C6166*",
},
{
"domain": "amazon_devices",
"macaddress": "7C6305*",
},
{
"domain": "amazon_devices",
"macaddress": "7CD566*",
},
{
"domain": "amazon_devices",
"macaddress": "8871E5*",
},
{
"domain": "amazon_devices",
"macaddress": "901195*",
},
{
"domain": "amazon_devices",
"macaddress": "90235B*",
},
{
"domain": "amazon_devices",
"macaddress": "90A822*",
},
{
"domain": "amazon_devices",
"macaddress": "90F82E*",
},
{
"domain": "amazon_devices",
"macaddress": "943A91*",
},
{
"domain": "amazon_devices",
"macaddress": "98226E*",
},
{
"domain": "amazon_devices",
"macaddress": "98CCF3*",
},
{
"domain": "amazon_devices",
"macaddress": "9CC8E9*",
},
{
"domain": "amazon_devices",
"macaddress": "A002DC*",
},
{
"domain": "amazon_devices",
"macaddress": "A0D2B1*",
},
{
"domain": "amazon_devices",
"macaddress": "A40801*",
},
{
"domain": "amazon_devices",
"macaddress": "A8E621*",
},
{
"domain": "amazon_devices",
"macaddress": "AC416A*",
},
{
"domain": "amazon_devices",
"macaddress": "AC63BE*",
},
{
"domain": "amazon_devices",
"macaddress": "ACCCFC*",
},
{
"domain": "amazon_devices",
"macaddress": "B0739C*",
},
{
"domain": "amazon_devices",
"macaddress": "B0CFCB*",
},
{
"domain": "amazon_devices",
"macaddress": "B0F7C4*",
},
{
"domain": "amazon_devices",
"macaddress": "B85F98*",
},
{
"domain": "amazon_devices",
"macaddress": "C091B9*",
},
{
"domain": "amazon_devices",
"macaddress": "C095CF*",
},
{
"domain": "amazon_devices",
"macaddress": "C49500*",
},
{
"domain": "amazon_devices",
"macaddress": "C86C3D*",
},
{
"domain": "amazon_devices",
"macaddress": "CC9EA2*",
},
{
"domain": "amazon_devices",
"macaddress": "CCF735*",
},
{
"domain": "amazon_devices",
"macaddress": "DC54D7*",
},
{
"domain": "amazon_devices",
"macaddress": "D8BE65*",
},
{
"domain": "amazon_devices",
"macaddress": "D8FBD6*",
},
{
"domain": "amazon_devices",
"macaddress": "DC91BF*",
},
{
"domain": "amazon_devices",
"macaddress": "DCA0D0*",
},
{
"domain": "amazon_devices",
"macaddress": "E0F728*",
},
{
"domain": "amazon_devices",
"macaddress": "EC2BEB*",
},
{
"domain": "amazon_devices",
"macaddress": "EC8AC4*",
},
{
"domain": "amazon_devices",
"macaddress": "ECA138*",
},
{
"domain": "amazon_devices",
"macaddress": "F02F9E*",
},
{
"domain": "amazon_devices",
"macaddress": "F0272D*",
},
{
"domain": "amazon_devices",
"macaddress": "F0F0A4*",
},
{
"domain": "amazon_devices",
"macaddress": "F4032A*",
},
{
"domain": "amazon_devices",
"macaddress": "F854B8*",
},
{
"domain": "amazon_devices",
"macaddress": "FC492D*",
},
{
"domain": "amazon_devices",
"macaddress": "FC65DE*",
},
{
"domain": "amazon_devices",
"macaddress": "FCA183*",
},
{
"domain": "amazon_devices",
"macaddress": "FCE9D8*",
},
{
"domain": "august",
"hostname": "connect",

64
tests/components/amazon_devices/test_config_flow.py
View File

@ -6,22 +6,15 @@ from aioamazondevices.exceptions import CannotAuthenticate, CannotConnect
import pytest
from homeassistant.components.amazon_devices.const import CONF_LOGIN_DATA, DOMAIN
from homeassistant.config_entries import SOURCE_DHCP, SOURCE_USER
from homeassistant.config_entries import SOURCE_USER
from homeassistant.const import CONF_CODE, CONF_COUNTRY, CONF_PASSWORD, CONF_USERNAME
from homeassistant.core import HomeAssistant
from homeassistant.data_entry_flow import FlowResultType
from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
from .const import TEST_CODE, TEST_COUNTRY, TEST_PASSWORD, TEST_USERNAME
from tests.common import MockConfigEntry
DHCP_DISCOVERY = DhcpServiceInfo(
ip="1.1.1.1",
hostname="",
macaddress="c095cfebf19f",
)
async def test_full_flow(
hass: HomeAssistant,
@ -140,58 +133,3 @@ async def test_already_configured(
assert result["type"] is FlowResultType.ABORT
assert result["reason"] == "already_configured"
async def test_dhcp_flow(
hass: HomeAssistant,
mock_amazon_devices_client: AsyncMock,
mock_setup_entry: AsyncMock,
) -> None:
"""Test full DHCP flow."""
result = await hass.config_entries.flow.async_init(
DOMAIN,
context={"source": SOURCE_DHCP},
data=DHCP_DISCOVERY,
)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "user"
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
{
CONF_COUNTRY: TEST_COUNTRY,
CONF_USERNAME: TEST_USERNAME,
CONF_PASSWORD: TEST_PASSWORD,
CONF_CODE: TEST_CODE,
},
)
assert result["type"] is FlowResultType.CREATE_ENTRY
assert result["title"] == TEST_USERNAME
assert result["data"] == {
CONF_COUNTRY: TEST_COUNTRY,
CONF_USERNAME: TEST_USERNAME,
CONF_PASSWORD: TEST_PASSWORD,
CONF_LOGIN_DATA: {
"customer_info": {"user_id": TEST_USERNAME},
},
}
assert result["result"].unique_id == TEST_USERNAME
async def test_dhcp_already_configured(
hass: HomeAssistant,
mock_amazon_devices_client: AsyncMock,
mock_setup_entry: AsyncMock,
mock_config_entry: MockConfigEntry,
) -> None:
"""Test duplicate flow."""
mock_config_entry.add_to_hass(hass)
result = await hass.config_entries.flow.async_init(
DOMAIN,
context={"source": SOURCE_DHCP},
data=DHCP_DISCOVERY,
)
assert result["type"] is FlowResultType.ABORT
assert result["reason"] == "already_configured"