daemon: refactored all_link_data to links

daemon/tests/test_core.py

@@ -120,7 +120,7 @@ class TestCore:
         session.instantiate()
 
         # check link data gets generated
-        assert ptp_node.all_link_data(MessageFlags.ADD)
+        assert ptp_node.links(MessageFlags.ADD)
 
         # check common nets exist between linked nodes
         assert node1.commonnets(node2)

daemon/tests/test_grpc.py

@@ -555,7 +555,7 @@ class TestGrpc:
         session = grpc_server.coreemu.create_session()
         switch = session.add_node(SwitchNode)
         node = session.add_node(CoreNode)
-        assert len(switch.all_link_data()) == 0
+        assert len(switch.links()) == 0
 
         # then
         iface = iface_helper.create_iface(node.id, 0)
@@ -564,7 +564,7 @@ class TestGrpc:
 
         # then
         assert response.result is True
-        assert len(switch.all_link_data()) == 1
+        assert len(switch.links()) == 1
 
     def test_add_link_exception(
         self, grpc_server: CoreGrpcServer, iface_helper: InterfaceHelper
@@ -589,7 +589,7 @@ class TestGrpc:
         iface = ip_prefixes.create_iface(node)
         session.add_link(node.id, switch.id, iface)
         options = core_pb2.LinkOptions(bandwidth=30000)
-        link = switch.all_link_data()[0]
+        link = switch.links()[0]
         assert options.bandwidth != link.options.bandwidth
 
         # then
@@ -600,7 +600,7 @@ class TestGrpc:
 
         # then
         assert response.result is True
-        link = switch.all_link_data()[0]
+        link = switch.links()[0]
         assert options.bandwidth == link.options.bandwidth
 
     def test_delete_link(self, grpc_server: CoreGrpcServer, ip_prefixes: IpPrefixes):
@@ -618,7 +618,7 @@ class TestGrpc:
             if node.id not in {node1.id, node2.id}:
                 link_node = node
                 break
-        assert len(link_node.all_link_data()) == 1
+        assert len(link_node.links()) == 1
 
         # then
         with client.context_connect():
@@ -628,7 +628,7 @@ class TestGrpc:
 
         # then
         assert response.result is True
-        assert len(link_node.all_link_data()) == 0
+        assert len(link_node.links()) == 0
 
     def test_get_wlan_config(self, grpc_server: CoreGrpcServer):
         # given
@@ -1029,7 +1029,7 @@ class TestGrpc:
         node = session.add_node(CoreNode)
         iface = ip_prefixes.create_iface(node)
         session.add_link(node.id, wlan.id, iface)
-        link_data = wlan.all_link_data()[0]
+        link_data = wlan.links()[0]
         queue = Queue()
 
         def handle_event(event_data):

daemon/tests/test_gui.py

@@ -122,7 +122,7 @@ class TestGui:
         coretlv.handle_message(message)
 
         switch_node = coretlv.session.get_node(switch_id, SwitchNode)
-        all_links = switch_node.all_link_data()
+        all_links = switch_node.links()
         assert len(all_links) == 1
 
     def test_link_add_net_to_node(self, coretlv: CoreHandler):
@@ -146,7 +146,7 @@ class TestGui:
         coretlv.handle_message(message)
 
         switch_node = coretlv.session.get_node(switch_id, SwitchNode)
-        all_links = switch_node.all_link_data()
+        all_links = switch_node.links()
         assert len(all_links) == 1
 
     def test_link_add_node_to_node(self, coretlv: CoreHandler):
@@ -176,7 +176,7 @@ class TestGui:
         all_links = []
         for node_id in coretlv.session.nodes:
             node = coretlv.session.nodes[node_id]
-            all_links += node.all_link_data()
+            all_links += node.links()
         assert len(all_links) == 1
 
     def test_link_update(self, coretlv: CoreHandler):
@@ -198,7 +198,7 @@ class TestGui:
         )
         coretlv.handle_message(message)
         switch_node = coretlv.session.get_node(switch_id, SwitchNode)
-        all_links = switch_node.all_link_data()
+        all_links = switch_node.links()
         assert len(all_links) == 1
         link = all_links[0]
         assert link.options.bandwidth is None
@@ -216,7 +216,7 @@ class TestGui:
         coretlv.handle_message(message)
 
         switch_node = coretlv.session.get_node(switch_id, SwitchNode)
-        all_links = switch_node.all_link_data()
+        all_links = switch_node.links()
         assert len(all_links) == 1
         link = all_links[0]
         assert link.options.bandwidth == bandwidth
@@ -245,7 +245,7 @@ class TestGui:
         all_links = []
         for node_id in coretlv.session.nodes:
             node = coretlv.session.nodes[node_id]
-            all_links += node.all_link_data()
+            all_links += node.links()
         assert len(all_links) == 1
 
         message = coreapi.CoreLinkMessage.create(
@@ -262,7 +262,7 @@ class TestGui:
         all_links = []
         for node_id in coretlv.session.nodes:
             node = coretlv.session.nodes[node_id]
-            all_links += node.all_link_data()
+            all_links += node.links()
         assert len(all_links) == 0
 
     def test_link_delete_node_to_net(self, coretlv: CoreHandler):
@@ -284,7 +284,7 @@ class TestGui:
         )
         coretlv.handle_message(message)
         switch_node = coretlv.session.get_node(switch_id, SwitchNode)
-        all_links = switch_node.all_link_data()
+        all_links = switch_node.links()
         assert len(all_links) == 1
 
         message = coreapi.CoreLinkMessage.create(
@@ -298,7 +298,7 @@ class TestGui:
         coretlv.handle_message(message)
 
         switch_node = coretlv.session.get_node(switch_id, SwitchNode)
-        all_links = switch_node.all_link_data()
+        all_links = switch_node.links()
         assert len(all_links) == 0
 
     def test_link_delete_net_to_node(self, coretlv: CoreHandler):
@@ -320,7 +320,7 @@ class TestGui:
         )
         coretlv.handle_message(message)
         switch_node = coretlv.session.get_node(switch_id, SwitchNode)
-        all_links = switch_node.all_link_data()
+        all_links = switch_node.links()
         assert len(all_links) == 1
 
         message = coreapi.CoreLinkMessage.create(
@@ -334,7 +334,7 @@ class TestGui:
         coretlv.handle_message(message)
 
         switch_node = coretlv.session.get_node(switch_id, SwitchNode)
-        all_links = switch_node.all_link_data()
+        all_links = switch_node.links()
         assert len(all_links) == 0
 
     def test_session_update(self, coretlv: CoreHandler):

daemon/tests/test_links.py

@@ -49,7 +49,7 @@ class TestLinks:
         session.add_link(node1.id, node2.id, iface1_data=iface1_data)
 
         # then
-        assert node2.all_link_data()
+        assert node2.links()
         assert node1.get_iface(iface1_data.id)
 
     def test_add_net_to_node(self, session: Session, ip_prefixes: IpPrefixes):
@@ -62,7 +62,7 @@ class TestLinks:
         session.add_link(node1.id, node2.id, iface2_data=iface2_data)
 
         # then
-        assert node1.all_link_data()
+        assert node1.links()
         assert node2.get_iface(iface2_data.id)
 
     def test_add_net_to_net(self, session):
@@ -74,7 +74,7 @@ class TestLinks:
         session.add_link(node1.id, node2.id)
 
         # then
-        assert node1.all_link_data()
+        assert node1.links()
 
     def test_update_node_to_net(self, session: Session, ip_prefixes: IpPrefixes):
         # given

daemon/tests/test_xml.py

@@ -285,7 +285,7 @@ class TestXml:
         switch2 = session.get_node(node2_id, SwitchNode)
         assert switch1
         assert switch2
-        assert len(switch1.all_link_data() + switch2.all_link_data()) == 1
+        assert len(switch1.links() + switch2.links()) == 1
 
     def test_link_options(
         self, session: Session, tmpdir: TemporaryFile, ip_prefixes: IpPrefixes
@@ -345,7 +345,7 @@ class TestXml:
         links = []
         for node_id in session.nodes:
             node = session.nodes[node_id]
-            links += node.all_link_data()
+            links += node.links()
         link = links[0]
         assert options.loss == link.options.loss
         assert options.bandwidth == link.options.bandwidth
@@ -412,7 +412,7 @@ class TestXml:
         links = []
         for node_id in session.nodes:
             node = session.nodes[node_id]
-            links += node.all_link_data()
+            links += node.links()
         link = links[0]
         assert options.loss == link.options.loss
         assert options.bandwidth == link.options.bandwidth
@@ -490,7 +490,7 @@ class TestXml:
         links = []
         for node_id in session.nodes:
             node = session.nodes[node_id]
-            links += node.all_link_data()
+            links += node.links()
         assert len(links) == 2
         link1 = links[0]
         link2 = links[1]