From 8d499753a0ba6b3cdfeca4b5f79f270147dae7fd Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Fri, 13 Nov 2020 16:58:28 +0100
Subject: [PATCH] Fix auto interface method (#2252)

---
 .../dbus/payloads/interface_update.tmpl       |  4 +-
 .../payloads/test_interface_update_payload.py | 86 +++++++++++++++++++
 2 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/supervisor/dbus/payloads/interface_update.tmpl b/supervisor/dbus/payloads/interface_update.tmpl
index 08ff80023..db57669bd 100644
--- a/supervisor/dbus/payloads/interface_update.tmpl
+++ b/supervisor/dbus/payloads/interface_update.tmpl
@@ -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'>,
diff --git a/tests/dbus/payloads/test_interface_update_payload.py b/tests/dbus/payloads/test_interface_update_payload.py
index bdc447d75..6458db79e 100644
--- a/tests/dbus/payloads/test_interface_update_payload.py
+++ b/tests/dbus/payloads/test_interface_update_payload.py
@@ -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."""