From fec44aef53e25b2ac1a83e851f92a5c212a5daef Mon Sep 17 00:00:00 2001
From: Marek Wolan <marek.wolan@methods.co.uk>
Date: Thu, 24 Aug 2023 13:03:16 +0100
Subject: [PATCH] Rename connect_nodes to connect and fix minor bug

---
 src/primaite/simulator/network/container.py              | 2 +-
 src/primaite/simulator/network/hardware/base.py          | 1 +
 tests/integration_tests/network/test_network_creation.py | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/primaite/simulator/network/container.py b/src/primaite/simulator/network/container.py
index 0612069c..1c03358c 100644
--- a/src/primaite/simulator/network/container.py
+++ b/src/primaite/simulator/network/container.py
@@ -72,7 +72,7 @@ class Network(SimComponent):
         del self.nodes[node.uuid]
         del node.parent  # misleading?
 
-    def connect_nodes(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.
 
         :param endpoint_a: The endpoint to which to connect the link on the first node
diff --git a/src/primaite/simulator/network/hardware/base.py b/src/primaite/simulator/network/hardware/base.py
index 5b49f008..fe3b5b15 100644
--- a/src/primaite/simulator/network/hardware/base.py
+++ b/src/primaite/simulator/network/hardware/base.py
@@ -1011,6 +1011,7 @@ class Switch(Node):
             self.switch_ports = {i: SwitchPort() for i in range(1, self.num_ports + 1)}
         for port_num, port in self.switch_ports.items():
             port.connected_node = self
+            port.parent = self
             port.port_num = port_num
 
     def show(self):
diff --git a/tests/integration_tests/network/test_network_creation.py b/tests/integration_tests/network/test_network_creation.py
index 70b48806..418f5e5f 100644
--- a/tests/integration_tests/network/test_network_creation.py
+++ b/tests/integration_tests/network/test_network_creation.py
@@ -51,7 +51,7 @@ def test_connecting_nodes():
     net.add_node(n1)
     net.add_node(n2)
 
-    net.connect_nodes(n1.nics[n1_nic.uuid], n2.nics[n2_nic.uuid], bandwidth=30)
+    net.connect(n1.nics[n1_nic.uuid], n2.nics[n2_nic.uuid], bandwidth=30)
 
     assert len(net.links) == 1
     link = list(net.links.values())[0]
@@ -70,7 +70,7 @@ def test_connecting_node_to_itself():
     net.add_node(node)
 
     with pytest.raises(RuntimeError):
-        net.connect_nodes(node.nics[nic1.uuid], node.nics[nic2.uuid], bandwidth=30)
+        net.connect(node.nics[nic1.uuid], node.nics[nic2.uuid], bandwidth=30)
 
     assert node in net
     assert nic1.connected_link is None