jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-24 09:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix auto interface method (#2252)

Browse Source
This commit is contained in:
Pascal Vizeli 2020-11-13 16:58:28 +01:00 committed by GitHub
parent 028ec277eb
commit 8d499753a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 88 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
supervisor/dbus/payloads/interface_update.tmpl
View File

@ -17,7 +17,7 @@
{
{% if interface.ipv4.method == "auto" %}
'method': <'auto'>
{% elif interface.ipv4.method == "disable" %}
{% elif interface.ipv4.method == "disabled" %}
'method': <'disabled'>
{% else %}
'method': <'manual'>,
@ -40,7 +40,7 @@
{
{% if interface.ipv6.method == "auto" %}
'method': <'auto'>
{% elif interface.ipv6.method == "disable" %}
{% elif interface.ipv6.method == "disabled" %}
'method': <'disabled'>
{% else %}
'method': <'manual'>,

86
tests/dbus/payloads/test_interface_update_payload.py
View File

@ -59,6 +59,50 @@ async def test_interface_update_payload_ethernet_ipv4(coresys):
assert DBus.parse_gvariant(data)["ipv4"]["gateway"] == "192.168.1.1"
@pytest.mark.asyncio
async def test_interface_update_payload_ethernet_ipv4_disabled(coresys):
"""Test interface update payload."""
interface = coresys.host.network.get(TEST_INTERFACE)
inet = coresys.dbus.network.interfaces[TEST_INTERFACE]
interface.ipv4.method = InterfaceMethod.DISABLED
data = interface_update_payload(
interface,
name=inet.settings.connection.id,
uuid=inet.settings.connection.uuid,
)
assert DBus.parse_gvariant(data)["ipv4"]["method"] == "disabled"
assert (
DBus.parse_gvariant(data)["connection"]["uuid"] == inet.settings.connection.uuid
)
assert DBus.parse_gvariant(data)["connection"]["id"] == inet.settings.connection.id
assert DBus.parse_gvariant(data)["connection"]["type"] == "802-3-ethernet"
assert DBus.parse_gvariant(data)["connection"]["interface-name"] == interface.name
@pytest.mark.asyncio
async def test_interface_update_payload_ethernet_ipv4_auto(coresys):
"""Test interface update payload."""
interface = coresys.host.network.get(TEST_INTERFACE)
inet = coresys.dbus.network.interfaces[TEST_INTERFACE]
interface.ipv4.method = InterfaceMethod.AUTO
data = interface_update_payload(
interface,
name=inet.settings.connection.id,
uuid=inet.settings.connection.uuid,
)
assert DBus.parse_gvariant(data)["ipv4"]["method"] == "auto"
assert (
DBus.parse_gvariant(data)["connection"]["uuid"] == inet.settings.connection.uuid
)
assert DBus.parse_gvariant(data)["connection"]["id"] == inet.settings.connection.id
assert DBus.parse_gvariant(data)["connection"]["type"] == "802-3-ethernet"
assert DBus.parse_gvariant(data)["connection"]["interface-name"] == interface.name
@pytest.mark.asyncio
async def test_interface_update_payload_ethernet_ipv6(coresys):
"""Test interface update payload."""
@ -97,6 +141,48 @@ async def test_interface_update_payload_ethernet_ipv6(coresys):
assert DBus.parse_gvariant(data)["ipv6"]["gateway"] == "fe80::da58:d7ff:fe00:9c69"
@pytest.mark.asyncio
async def test_interface_update_payload_ethernet_ipv6_disabled(coresys):
"""Test interface update payload."""
interface = coresys.host.network.get(TEST_INTERFACE)
inet = coresys.dbus.network.interfaces[TEST_INTERFACE]
interface.ipv6.method = InterfaceMethod.DISABLED
data = interface_update_payload(
interface,
name=inet.settings.connection.id,
uuid=inet.settings.connection.uuid,
)
assert DBus.parse_gvariant(data)["ipv6"]["method"] == "disabled"
assert (
DBus.parse_gvariant(data)["connection"]["uuid"] == inet.settings.connection.uuid
)
assert DBus.parse_gvariant(data)["connection"]["id"] == inet.settings.connection.id
assert DBus.parse_gvariant(data)["connection"]["type"] == "802-3-ethernet"
assert DBus.parse_gvariant(data)["connection"]["interface-name"] == interface.name
@pytest.mark.asyncio
async def test_interface_update_payload_ethernet_ipv6_auto(coresys):
"""Test interface update payload."""
interface = coresys.host.network.get(TEST_INTERFACE)
inet = coresys.dbus.network.interfaces[TEST_INTERFACE]
interface.ipv6.method = InterfaceMethod.AUTO
data = interface_update_payload(
interface,
name=inet.settings.connection.id,
uuid=inet.settings.connection.uuid,
)
assert DBus.parse_gvariant(data)["ipv6"]["method"] == "auto"
assert (
DBus.parse_gvariant(data)["connection"]["uuid"] == inet.settings.connection.uuid
)
assert DBus.parse_gvariant(data)["connection"]["id"] == inet.settings.connection.id
assert DBus.parse_gvariant(data)["connection"]["type"] == "802-3-ethernet"
assert DBus.parse_gvariant(data)["connection"]["interface-name"] == interface.name
@pytest.mark.asyncio
async def test_interface_update_payload_wireless_wpa_psk(coresys):
"""Test interface update payload."""