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

Fix NM naming schema (#2318)

Browse Source 
* Fix NM naming schema

* Address comments

* Add test
This commit is contained in:
Pascal Vizeli 2020-12-01 12:11:20 +01:00 committed by GitHub
parent fb4386a7ad
commit 06e10fdd3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
supervisor/dbus/payloads/generate.py
View File

@ -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:

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

@ -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"]