From 49bc0624af0cff88647e17e1b9bc67db03089ad9 Mon Sep 17 00:00:00 2001 From: Mike Degatano Date: Mon, 24 Jun 2024 15:47:58 -0400 Subject: [PATCH] Ignore dns-data field in network settings update (#5147) --- supervisor/dbus/network/setting/__init__.py | 1 + tests/dbus/network/setting/test_init.py | 2 ++ tests/dbus_service_mocks/network_connection_settings.py | 1 + 3 files changed, 4 insertions(+) diff --git a/supervisor/dbus/network/setting/__init__.py b/supervisor/dbus/network/setting/__init__.py index 813efdbb3..2b065c093 100644 --- a/supervisor/dbus/network/setting/__init__.py +++ b/supervisor/dbus/network/setting/__init__.py @@ -44,6 +44,7 @@ IPV4_6_IGNORE_FIELDS = [ "addresses", "address-data", "dns", + "dns-data", "gateway", "method", ] diff --git a/tests/dbus/network/setting/test_init.py b/tests/dbus/network/setting/test_init.py index 0947c3551..40a8e4524 100644 --- a/tests/dbus/network/setting/test_init.py +++ b/tests/dbus/network/setting/test_init.py @@ -67,6 +67,7 @@ async def test_update( assert settings["ipv4"]["method"] == Variant("s", "auto") assert "gateway" not in settings["ipv4"] assert "dns" not in settings["ipv4"] + assert "dns-data" not in settings["ipv4"] assert "address-data" not in settings["ipv4"] assert "addresses" not in settings["ipv4"] assert len(settings["ipv4"]["route-data"].value) == 1 @@ -83,6 +84,7 @@ async def test_update( assert settings["ipv6"]["method"] == Variant("s", "auto") assert "gateway" not in settings["ipv6"] assert "dns" not in settings["ipv6"] + assert "dns-data" not in settings["ipv6"] assert "address-data" not in settings["ipv6"] assert "addresses" not in settings["ipv6"] assert settings["ipv6"]["addr-gen-mode"] == Variant("i", 0) diff --git a/tests/dbus_service_mocks/network_connection_settings.py b/tests/dbus_service_mocks/network_connection_settings.py index 6c480846b..4ee601f18 100644 --- a/tests/dbus_service_mocks/network_connection_settings.py +++ b/tests/dbus_service_mocks/network_connection_settings.py @@ -31,6 +31,7 @@ SETTINGS_FIXTURE: dict[str, dict[str, Variant]] = { ), "addresses": Variant("aau", [[2483202240, 24, 16951488]]), "dns": Variant("au", [16951488]), + "dns-data": Variant("as", ["192.168.2.1"]), "dns-search": Variant("as", []), "gateway": Variant("s", "192.168.2.1"), "method": Variant("s", "auto"),