From 1fa0ac25b55f92cdfe0177687b7e739846d60478 Mon Sep 17 00:00:00 2001 From: Blake Harnden <32446120+bharnden@users.noreply.github.com> Date: Thu, 24 Mar 2022 17:15:44 -0700 Subject: [PATCH] gui: removed host from node model types and updated node config to only display type --- daemon/core/gui/dialogs/nodeconfig.py | 9 ++------- daemon/core/gui/nodeutils.py | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/daemon/core/gui/dialogs/nodeconfig.py b/daemon/core/gui/dialogs/nodeconfig.py index 1c477cbf..c9ca67f5 100644 --- a/daemon/core/gui/dialogs/nodeconfig.py +++ b/daemon/core/gui/dialogs/nodeconfig.py @@ -230,13 +230,8 @@ class NodeConfigDialog(Dialog): if nutils.is_model(self.node): label = ttk.Label(frame, text="Type") label.grid(row=row, column=0, sticky=tk.EW, padx=PADX, pady=PADY) - combobox = ttk.Combobox( - frame, - textvariable=self.type, - values=list(nutils.NODE_MODELS), - state=combo_state, - ) - combobox.grid(row=row, column=1, sticky=tk.EW) + entry = ttk.Entry(frame, textvariable=self.type, state=tk.DISABLED) + entry.grid(row=row, column=1, sticky=tk.EW) row += 1 # container image field diff --git a/daemon/core/gui/nodeutils.py b/daemon/core/gui/nodeutils.py index dd6af5db..ebd96ab0 100644 --- a/daemon/core/gui/nodeutils.py +++ b/daemon/core/gui/nodeutils.py @@ -23,7 +23,7 @@ RJ45_NODES: Set[NodeType] = {NodeType.RJ45} BRIDGE_NODES: Set[NodeType] = {NodeType.HUB, NodeType.SWITCH} IGNORE_NODES: Set[NodeType] = {NodeType.CONTROL_NET} MOBILITY_NODES: Set[NodeType] = {NodeType.WIRELESS_LAN, NodeType.EMANE} -NODE_MODELS: Set[str] = {"router", "host", "PC", "mdr", "prouter"} +NODE_MODELS: Set[str] = {"router", "PC", "mdr", "prouter"} ROUTER_NODES: Set[str] = {"router", "mdr"} ANTENNA_ICON: Optional[PhotoImage] = None