From ddaba7c477045cc47a690cede56da07e2cd9fd24 Mon Sep 17 00:00:00 2001
From: Huy Pham <42948410+hpham@users.noreply.github.com>
Date: Mon, 24 Feb 2020 10:58:01 -0800
Subject: [PATCH] remove code for deleting wireless links and nodes during
 runtime

---
 daemon/core/gui/graph/node.py | 43 ++---------------------------------
 daemon/core/gui/nodeutils.py  |  4 ----
 2 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/daemon/core/gui/graph/node.py b/daemon/core/gui/graph/node.py
index 7b4ccf31..3ed5b1d9 100644
--- a/daemon/core/gui/graph/node.py
+++ b/daemon/core/gui/graph/node.py
@@ -17,7 +17,7 @@ from core.gui.errors import show_grpc_error
 from core.gui.graph import tags
 from core.gui.graph.tooltip import CanvasTooltip
 from core.gui.images import ImageEnum, Images
-from core.gui.nodeutils import ANTENNA_SIZE, EdgeUtils, NodeUtils
+from core.gui.nodeutils import ANTENNA_SIZE, NodeUtils
 
 if TYPE_CHECKING:
     from core.gui.app import Application
@@ -66,48 +66,9 @@ class CanvasNode:
 
     def delete(self):
         logging.debug("Delete canvas node for %s", self.core_node)
-
-        # if node is wlan, EMANE type, remove any existing wireless links between nodes connetect to this node
-        if NodeUtils.is_wireless_node(self.core_node.type):
-            nodes = []
-            for edge in self.edges:
-                token = edge.token
-                if self.id == token[0]:
-                    nodes.append(token[1])
-                else:
-                    nodes.append(token[0])
-            for i in range(len(nodes)):
-                for j in range(i + 1, len(nodes)):
-                    token = EdgeUtils.get_token(nodes[i], nodes[j])
-                    wireless_edge = self.canvas.wireless_edges.pop(token, None)
-                    if wireless_edge:
-
-                        self.canvas.nodes[nodes[i]].wireless_edges.remove(wireless_edge)
-                        self.canvas.nodes[nodes[j]].wireless_edges.remove(wireless_edge)
-                        self.canvas.delete(wireless_edge.id)
-                    else:
-                        logging.debug("%s is not a wireless edge", token)
-        # if node is MDR, remove wireless links to other MDRs
-        elif NodeUtils.is_mdr_node(self.core_node.type, self.core_node.model):
-            for wireless_edge in self.wireless_edges:
-                token = wireless_edge.token
-                other = token[0]
-                if other == self.id:
-                    other = token[1]
-                self.canvas.nodes[other].wireless_edges.discard(wireless_edge)
-                try:
-                    wlan_edge = self.canvas.wireless_edges.pop(token)
-                    self.canvas.delete(wlan_edge.id)
-                except KeyError:
-                    logging.error(
-                        "wireless link not found, potentially multiple wireless link issue"
-                    )
-            self.delete_antennas()
-
-            self.wireless_edges.clear()
-
         self.canvas.delete(self.id)
         self.canvas.delete(self.text_id)
+        self.delete_antennas()
 
     def add_antenna(self):
         x, y = self.canvas.coords(self.id)
diff --git a/daemon/core/gui/nodeutils.py b/daemon/core/gui/nodeutils.py
index 870ac8bf..81aa2cba 100644
--- a/daemon/core/gui/nodeutils.py
+++ b/daemon/core/gui/nodeutils.py
@@ -90,10 +90,6 @@ class NodeUtils:
     def is_rj45_node(cls, node_type: NodeType) -> bool:
         return node_type in cls.RJ45_NODES
 
-    @classmethod
-    def is_mdr_node(cls, node_type: NodeType, model: str) -> bool:
-        return cls.is_container_node(node_type) and model == "mdr"
-
     @classmethod
     def node_icon(
         cls,