Apply suggestions from code review.

This commit is contained in:
Marek Wolan
2023-08-25 15:58:07 +01:00
parent 05bb0f295b
commit ae6e835955
2 changed files with 18 additions and 19 deletions

View File

@@ -52,11 +52,11 @@ class Network(SimComponent):
:type node: Node :type node: Node
""" """
if node in self: if node in self:
msg = f"Can't add node {node}. It is already in the network." _LOGGER.warning(f"Can't add node {node.uuid}. It is already in the network.")
_LOGGER.warning(msg) return
raise RuntimeWarning(msg)
self.nodes[node.uuid] = node self.nodes[node.uuid] = node
node.parent = self node.parent = self
_LOGGER.info(f"Added node {node.uuid} to Network {self.uuid}")
def remove_node(self, node: Node) -> None: def remove_node(self, node: Node) -> None:
""" """
@@ -66,11 +66,11 @@ class Network(SimComponent):
:type node: Node :type node: Node
""" """
if node not in self: if node not in self:
msg = f"Can't remove node {node}. It's not in the network." _LOGGER.warning(f"Can't remove node {node.uuid}. It's not in the network.")
_LOGGER.warning(msg) return
raise RuntimeWarning(msg) self.nodes.pop(node.uuid)
del self.nodes[node.uuid] node.parent = None
del node.parent # misleading? _LOGGER.info(f"Removed node {node.uuid} from network {self.uuid}")
def connect(self, endpoint_a: Union[NIC, SwitchPort], endpoint_b: Union[NIC, SwitchPort], **kwargs) -> None: def connect(self, endpoint_a: Union[NIC, SwitchPort], endpoint_b: Union[NIC, SwitchPort], **kwargs) -> None:
"""Connect two nodes on the network by creating a link between an NIC/SwitchPort of each one. """Connect two nodes on the network by creating a link between an NIC/SwitchPort of each one.
@@ -83,20 +83,18 @@ class Network(SimComponent):
""" """
node_a = endpoint_a.parent node_a = endpoint_a.parent
node_b = endpoint_b.parent node_b = endpoint_b.parent
msg = ""
if node_a not in self: if node_a not in self:
msg = f"Cannot create a link to {endpoint_a} because the node is not in the network." self.add_node(node_a)
if node_b not in self: if node_b not in self:
msg = f"Cannot create a link to {endpoint_b} because the node is not in the network." self.add_node(node_b)
if node_a is node_b: if node_a is node_b:
msg = f"Cannot link {endpoint_a} to {endpoint_b} because they belong to the same node." _LOGGER.warn(f"Cannot link endpoint {endpoint_a} to {endpoint_b} because they belong to the same node.")
if msg: return
_LOGGER.error(msg)
raise RuntimeError(msg)
link = Link(endpoint_a=endpoint_a, endpoint_b=endpoint_b, **kwargs) link = Link(endpoint_a=endpoint_a, endpoint_b=endpoint_b, **kwargs)
self.links[link.uuid] = link self.links[link.uuid] = link
link.parent = self link.parent = self
_LOGGER.info(f"Added link {link.uuid} to connect {endpoint_a} and {endpoint_b}")
def remove_link(self, link: Link) -> None: def remove_link(self, link: Link) -> None:
"""Disconnect a link from the network. """Disconnect a link from the network.
@@ -106,12 +104,13 @@ class Network(SimComponent):
""" """
link.endpoint_a.disconnect_link() link.endpoint_a.disconnect_link()
link.endpoint_b.disconnect_link() link.endpoint_b.disconnect_link()
del self.links[link.uuid] self.links.pop(link.uuid)
del link.parent link.parent = None
_LOGGER.info(f"Removed link {link.uuid} from network {self.uuid}.")
def __contains__(self, item: Any) -> bool: def __contains__(self, item: Any) -> bool:
if isinstance(item, Node): if isinstance(item, Node):
return item.uuid in self.nodes return item.uuid in self.nodes
elif isinstance(item, Link): elif isinstance(item, Link):
return item.uuid in self.links return item.uuid in self.links
raise TypeError("") return False

View File

@@ -939,7 +939,7 @@ class Node(SimComponent):
nic = self.nics.get(nic) nic = self.nics.get(nic)
if nic or nic.uuid in self.nics: if nic or nic.uuid in self.nics:
self.nics.pop(nic.uuid) self.nics.pop(nic.uuid)
del nic.parent nic.parent = None
nic.disable() nic.disable()
self.sys_log.info(f"Disconnected NIC {nic}") self.sys_log.info(f"Disconnected NIC {nic}")
else: else: