afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

daemon: fixed sdt link layer usage to avoid assigning links to not leaf layers, added type hinting to globals in sdt file

Browse source
This commit is contained in:
Blake Harnden 2021-03-09 09:36:03 -08:00
parent f13334cc58
commit b2626b8d0e
1 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
daemon/core/plugins/sdt.py
View file

@ -4,7 +4,7 @@ sdt.py: Scripted Display Tool (SDT3D) helper
import logging import logging
import socket import socket
from typing import IO, TYPE_CHECKING, Dict, Optional, Set, Tuple from typing import IO, TYPE_CHECKING, Dict, List, Optional, Set, Tuple
from urllib.parse import urlparse from urllib.parse import urlparse
from core.constants import CORE_CONF_DIR, CORE_DATA_DIR from core.constants import CORE_CONF_DIR, CORE_DATA_DIR
@ -26,11 +26,12 @@ def get_link_id(node1_id: int, node2_id: int, network_id: int) -> str:
return link_id return link_id
CORE_LAYER = "CORE" CORE_LAYER: str = "CORE"
NODE_LAYER = "CORE::Nodes" NODE_LAYER: str = "CORE::Nodes"
LINK_LAYER = "CORE::Links" LINK_LAYER: str = "CORE::Links"
CORE_LAYERS = [CORE_LAYER, LINK_LAYER, NODE_LAYER] WIRED_LINK_LAYER: str = f"{LINK_LAYER}::wired"
DEFAULT_LINK_COLOR = "red" CORE_LAYERS: List[str] = [CORE_LAYER, LINK_LAYER, NODE_LAYER, WIRED_LINK_LAYER]
DEFAULT_LINK_COLOR: str = "red"
class Sdt: class Sdt:
@ -365,13 +366,10 @@ class Sdt:
color = self.session.get_link_color(network_id) color = self.session.get_link_color(network_id)
line = f"{color},2" line = f"{color},2"
link_id = get_link_id(node1_id, node2_id, network_id) link_id = get_link_id(node1_id, node2_id, network_id)
layer = LINK_LAYER
if network_id: if network_id:
node = self.session.nodes.get(network_id) layer = self.get_network_layer(network_id)
if node: else:
network_name = node.name layer = WIRED_LINK_LAYER
layer = f"{layer}::{network_name}"
self.network_layers.add(layer)
link_label = "" link_label = ""
if label: if label:
link_label = f'linklabel on,"{label}"' link_label = f'linklabel on,"{label}"'
@ -380,6 +378,15 @@ class Sdt:
f"{link_label}" f"{link_label}"
) )
def get_network_layer(self, network_id: int) -> str:
node = self.session.nodes.get(network_id)
if node:
layer = f"{LINK_LAYER}::{node.name}"
self.network_layers.add(layer)
else:
layer = WIRED_LINK_LAYER
return layer
def delete_link(self, node1_id: int, node2_id: int, network_id: int = None) -> None: def delete_link(self, node1_id: int, node2_id: int, network_id: int = None) -> None:
""" """
Handle deleting a link in SDT. Handle deleting a link in SDT.