From 06e10fdd3cd62d63fbc6cd750a16f8aa30c21cee Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Tue, 1 Dec 2020 12:11:20 +0100
Subject: [PATCH] Fix NM naming schema (#2318)

* Fix NM naming schema

* Address comments

* Add test
---
 supervisor/dbus/payloads/generate.py                |  8 ++++----
 .../dbus/payloads/test_interface_update_payload.py  | 13 +++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/supervisor/dbus/payloads/generate.py b/supervisor/dbus/payloads/generate.py
index 1c4051f89..7ee049cb9 100644
--- a/supervisor/dbus/payloads/generate.py
+++ b/supervisor/dbus/payloads/generate.py
@@ -43,11 +43,11 @@ def interface_update_payload(
     if not uuid:
         uuid = str(uuid4())
 
-    # Generate ID/name
-    if not name and interface.type != InterfaceType.VLAN:
+    # Generate/Update ID/name
+    if not name or not name.startswith("Supervisor"):
         name = f"Supervisor {interface.name}"
-    elif not name:
-        name = f"Supervisor {interface.name}.{interface.vlan.id}"
+    if interface.type == InterfaceType.VLAN:
+        name = f"{name}.{interface.vlan.id}"
 
     # Fix SSID
     if interface.wifi:
diff --git a/tests/dbus/payloads/test_interface_update_payload.py b/tests/dbus/payloads/test_interface_update_payload.py
index 9540d4237..439fa12c1 100644
--- a/tests/dbus/payloads/test_interface_update_payload.py
+++ b/tests/dbus/payloads/test_interface_update_payload.py
@@ -54,7 +54,7 @@ async def test_interface_update_payload_ethernet_ipv4(coresys):
     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"]["id"] == "Supervisor eth0"
     assert DBus.parse_gvariant(data)["connection"]["type"] == "802-3-ethernet"
     assert DBus.parse_gvariant(data)["connection"]["interface-name"] == interface.name
     assert DBus.parse_gvariant(data)["ipv4"]["gateway"] == "192.168.1.1"
@@ -77,7 +77,7 @@ async def test_interface_update_payload_ethernet_ipv4_disabled(coresys):
     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"]["id"] == "Supervisor eth0"
     assert DBus.parse_gvariant(data)["connection"]["type"] == "802-3-ethernet"
     assert DBus.parse_gvariant(data)["connection"]["interface-name"] == interface.name
 
@@ -99,7 +99,7 @@ async def test_interface_update_payload_ethernet_ipv4_auto(coresys):
     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"]["id"] == "Supervisor eth0"
     assert DBus.parse_gvariant(data)["connection"]["type"] == "802-3-ethernet"
     assert DBus.parse_gvariant(data)["connection"]["interface-name"] == interface.name
 
@@ -136,7 +136,7 @@ async def test_interface_update_payload_ethernet_ipv6(coresys):
     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"]["id"] == "Supervisor eth0"
     assert DBus.parse_gvariant(data)["connection"]["type"] == "802-3-ethernet"
     assert DBus.parse_gvariant(data)["connection"]["interface-name"] == interface.name
     assert DBus.parse_gvariant(data)["ipv6"]["gateway"] == "fe80::da58:d7ff:fe00:9c69"
@@ -158,7 +158,7 @@ async def test_interface_update_payload_ethernet_ipv6_disabled(coresys):
     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"]["id"] == "Supervisor eth0"
     assert DBus.parse_gvariant(data)["connection"]["type"] == "802-3-ethernet"
     assert DBus.parse_gvariant(data)["connection"]["interface-name"] == interface.name
 
@@ -179,7 +179,7 @@ async def test_interface_update_payload_ethernet_ipv6_auto(coresys):
     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"]["id"] == "Supervisor eth0"
     assert DBus.parse_gvariant(data)["connection"]["type"] == "802-3-ethernet"
     assert DBus.parse_gvariant(data)["connection"]["interface-name"] == interface.name
 
@@ -265,4 +265,5 @@ async def test_interface_update_payload_vlan(coresys):
     assert DBus.parse_gvariant(data)["vlan"]["id"] == 10
     assert DBus.parse_gvariant(data)["vlan"]["parent"] == interface.name
     assert DBus.parse_gvariant(data)["connection"]["type"] == "vlan"
+    assert DBus.parse_gvariant(data)["connection"]["id"] == "Supervisor eth0.10"
     assert "interface-name" not in DBus.parse_gvariant(data)["connection"]