merged latest updates from develop

daemon/tests/test_grpc.py

@@ -34,7 +34,7 @@ from core.api.grpc.wrappers import (
 from core.emane.models.ieee80211abg import EmaneIeee80211abgModel
 from core.emane.nodes import EmaneNet
 from core.emulator.data import EventData, IpPrefixes, NodeData, NodeOptions
-from core.emulator.enumerations import EventTypes, ExceptionLevels
+from core.emulator.enumerations import EventTypes, ExceptionLevels, MessageFlags
 from core.errors import CoreError
 from core.location.mobility import BasicRangeModel, Ns2ScriptedMobility
 from core.nodes.base import CoreNode
@@ -413,7 +413,7 @@ class TestGrpc:
         session = grpc_server.coreemu.create_session()
         switch = session.add_node(SwitchNode)
         node = session.add_node(CoreNode)
-        assert len(switch.links()) == 0
+        assert len(session.link_manager.links()) == 0
         iface = InterfaceHelper("10.0.0.0/24").create_iface(node.id, 0)
         link = Link(node.id, switch.id, iface1=iface)
 
@@ -423,7 +423,7 @@ class TestGrpc:
 
         # then
         assert result is True
-        assert len(switch.links()) == 1
+        assert len(session.link_manager.links()) == 1
         assert iface1.id == iface.id
         assert iface1.ip4 == iface.ip4
 
@@ -445,11 +445,10 @@ class TestGrpc:
         session = grpc_server.coreemu.create_session()
         switch = session.add_node(SwitchNode)
         node = session.add_node(CoreNode)
-        iface = ip_prefixes.create_iface(node)
-        session.add_link(node.id, switch.id, iface)
+        iface_data = ip_prefixes.create_iface(node)
+        iface, _ = session.add_link(node.id, switch.id, iface_data)
         options = LinkOptions(bandwidth=30000)
-        link = switch.links()[0]
-        assert options.bandwidth != link.options.bandwidth
+        assert iface.options.bandwidth != options.bandwidth
         link = Link(node.id, switch.id, iface1=Interface(id=iface.id), options=options)
 
         # then
@@ -458,8 +457,7 @@ class TestGrpc:
 
         # then
         assert result is True
-        link = switch.links()[0]
-        assert options.bandwidth == link.options.bandwidth
+        assert options.bandwidth == iface.options.bandwidth
 
     def test_delete_link(self, grpc_server: CoreGrpcServer, ip_prefixes: IpPrefixes):
         # given
@@ -470,13 +468,7 @@ class TestGrpc:
         node2 = session.add_node(CoreNode)
         iface2 = ip_prefixes.create_iface(node2)
         session.add_link(node1.id, node2.id, iface1, iface2)
-        link_node = None
-        for node_id in session.nodes:
-            node = session.nodes[node_id]
-            if node.id not in {node1.id, node2.id}:
-                link_node = node
-                break
-        assert len(link_node.links()) == 1
+        assert len(session.link_manager.links()) == 1
         link = Link(
             node1.id,
             node2.id,
@@ -490,7 +482,7 @@ class TestGrpc:
 
         # then
         assert result is True
-        assert len(link_node.links()) == 0
+        assert len(session.link_manager.links()) == 0
 
     def test_get_wlan_config(self, grpc_server: CoreGrpcServer):
         # given
@@ -755,9 +747,11 @@ class TestGrpc:
         session = grpc_server.coreemu.create_session()
         wlan = session.add_node(WlanNode)
         node = session.add_node(CoreNode)
-        iface = ip_prefixes.create_iface(node)
-        session.add_link(node.id, wlan.id, iface)
-        link_data = wlan.links()[0]
+        iface_data = ip_prefixes.create_iface(node)
+        session.add_link(node.id, wlan.id, iface_data)
+        core_link = list(session.link_manager.links())[0]
+        link_data = core_link.get_data(MessageFlags.ADD)
+
         queue = Queue()
 
         def handle_event(event: Event) -> None:
@@ -932,3 +926,26 @@ class TestGrpc:
         with pytest.raises(grpc.RpcError):
             with client.context_connect():
                 client.move_nodes(streamer)
+
+    def test_wlan_link(self, grpc_server: CoreGrpcServer, ip_prefixes: IpPrefixes):
+        # given
+        client = CoreGrpcClient()
+        session = grpc_server.coreemu.create_session()
+        wlan = session.add_node(WlanNode)
+        node1 = session.add_node(CoreNode)
+        node2 = session.add_node(CoreNode)
+        iface1_data = ip_prefixes.create_iface(node1)
+        iface2_data = ip_prefixes.create_iface(node2)
+        session.add_link(node1.id, wlan.id, iface1_data)
+        session.add_link(node2.id, wlan.id, iface2_data)
+        session.instantiate()
+        assert len(session.link_manager.links()) == 2
+
+        # when
+        with client.context_connect():
+            result1 = client.wlan_link(session.id, wlan.id, node1.id, node2.id, True)
+            result2 = client.wlan_link(session.id, wlan.id, node1.id, node2.id, False)
+
+        # then
+        assert result1 is True
+        assert result2 is True