Almost working local example for linux ns-3 simulator

[nepi.git] / src / nepi / resources / ns3 / ns3node.py

diff --git a/src/nepi/resources/ns3/ns3node.py b/src/nepi/resources/ns3/ns3node.py
index 0cecfa7..62d2a38 100644 (file)
--- a/src/nepi/resources/ns3/ns3node.py
+++ b/src/nepi/resources/ns3/ns3node.py
@@ -32,8 +32,10 @@ class NS3BaseNode(NS3Base):
             if isinstance(rm, NS3Simulator):
                 return rm
 
-        return None
-
+        msg = "Node not connected to simulator"
+        self.error(msg)
+        raise RuntimeError, msg
+ 
     @property
     def ipv4(self):
         from nepi.resources.ns3.ns3ipv4l3protocol import NS3BaseIpv4L3Protocol
@@ -42,8 +44,10 @@ class NS3BaseNode(NS3Base):
         return None
 
     @property
-    def others_to_wait(self):
-        return set()
+    def _rms_to_wait(self):
+        rms = set()
+        rms.add(self.simulator)
+        return rms
 
     def _configure_object(self):
         ### node.AggregateObject(PacketSocketFactory())