Adds vlan_struct (#2337)

* Return VLAN ID instead of wifistruct for VLAN

* Use vlan_struct

* fix typing

Co-authored-by: Pascal Vizeli <pvizeli@syshack.ch>
This commit is contained in:
Joakim Sørensen 2020-12-04 11:37:55 +01:00 committed by GitHub
parent 6245b6d823
commit c8e00ba160
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions

View File

@ -18,6 +18,7 @@ from ..const import (
ATTR_FREQUENCY, ATTR_FREQUENCY,
ATTR_GATEWAY, ATTR_GATEWAY,
ATTR_HOST_INTERNET, ATTR_HOST_INTERNET,
ATTR_ID,
ATTR_INTERFACE, ATTR_INTERFACE,
ATTR_INTERFACES, ATTR_INTERFACES,
ATTR_IPV4, ATTR_IPV4,
@ -26,6 +27,7 @@ from ..const import (
ATTR_METHOD, ATTR_METHOD,
ATTR_MODE, ATTR_MODE,
ATTR_NAMESERVERS, ATTR_NAMESERVERS,
ATTR_PARENT,
ATTR_PRIMARY, ATTR_PRIMARY,
ATTR_PSK, ATTR_PSK,
ATTR_SIGNAL, ATTR_SIGNAL,
@ -80,7 +82,7 @@ SCHEMA_UPDATE = vol.Schema(
) )
def ipconfig_struct(config: IpConfig) -> dict: def ipconfig_struct(config: IpConfig) -> Dict[str, Any]:
"""Return a dict with information about ip configuration.""" """Return a dict with information about ip configuration."""
return { return {
ATTR_METHOD: config.method, ATTR_METHOD: config.method,
@ -90,7 +92,7 @@ def ipconfig_struct(config: IpConfig) -> dict:
} }
def wifi_struct(config: WifiConfig) -> dict: def wifi_struct(config: WifiConfig) -> Dict[str, Any]:
"""Return a dict with information about wifi configuration.""" """Return a dict with information about wifi configuration."""
return { return {
ATTR_MODE: config.mode, ATTR_MODE: config.mode,
@ -100,7 +102,15 @@ def wifi_struct(config: WifiConfig) -> dict:
} }
def interface_struct(interface: Interface) -> dict: def vlan_struct(config: VlanConfig) -> Dict[str, Any]:
"""Return a dict with information about VLAN configuration."""
return {
ATTR_ID: config.id,
ATTR_PARENT: config.interface,
}
def interface_struct(interface: Interface) -> Dict[str, Any]:
"""Return a dict with information of a interface to be used in th API.""" """Return a dict with information of a interface to be used in th API."""
return { return {
ATTR_INTERFACE: interface.name, ATTR_INTERFACE: interface.name,
@ -115,7 +125,7 @@ def interface_struct(interface: Interface) -> dict:
} }
def accesspoint_struct(accesspoint: AccessPoint) -> dict: def accesspoint_struct(accesspoint: AccessPoint) -> Dict[str, Any]:
"""Return a dict for AccessPoint.""" """Return a dict for AccessPoint."""
return { return {
ATTR_MODE: accesspoint.mode, ATTR_MODE: accesspoint.mode,

View File

@ -153,6 +153,7 @@ ATTR_HOST_NETWORK = "host_network"
ATTR_HOST_PID = "host_pid" ATTR_HOST_PID = "host_pid"
ATTR_HOSTNAME = "hostname" ATTR_HOSTNAME = "hostname"
ATTR_ICON = "icon" ATTR_ICON = "icon"
ATTR_ID = "id"
ATTR_ISSUES = "issues" ATTR_ISSUES = "issues"
ATTR_IMAGE = "image" ATTR_IMAGE = "image"
ATTR_IMAGES = "images" ATTR_IMAGES = "images"
@ -205,6 +206,7 @@ ATTR_PANEL_ICON = "panel_icon"
ATTR_PANEL_TITLE = "panel_title" ATTR_PANEL_TITLE = "panel_title"
ATTR_PANELS = "panels" ATTR_PANELS = "panels"
ATTR_PASSWORD = "password" ATTR_PASSWORD = "password"
ATTR_PARENT = "parent"
ATTR_PORT = "port" ATTR_PORT = "port"
ATTR_PORTS = "ports" ATTR_PORTS = "ports"
ATTR_PORTS_DESCRIPTION = "ports_description" ATTR_PORTS_DESCRIPTION = "ports_description"