Almost working local example for linux ns-3 simulator

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

diff --git a/src/nepi/resources/ns3/ns3wifimac.py b/src/nepi/resources/ns3/ns3wifimac.py
index 6cc4c16..7e1cf8f 100644 (file)
--- a/src/nepi/resources/ns3/ns3wifimac.py
+++ b/src/nepi/resources/ns3/ns3wifimac.py
@@ -24,23 +24,31 @@ from nepi.resources.ns3.ns3base import NS3Base
 class NS3BaseWifiMac(NS3Base):
     _rtype = "abstract::ns3::WifiMac"
 
+    @property
+    def node(self):
+        return self.device.node
+
     @property
     def device(self):
         from nepi.resources.ns3.ns3device import NS3BaseNetDevice
         devices = self.get_connected(NS3BaseNetDevice.get_rtype())
-        if devices: return devices[0]
-        return None
+
+        if not devices: 
+            msg = "WifiMac not connected to device"
+            self.error(msg)
+            raise RuntimeError, msg
+
+        return devices[0]
 
     @property
-    def others_to_wait(self):
-        others = set()
-        device = self.device
-        if device: others.add(device)
-        return others
+    def _rms_to_wait(self):
+        rms = set()
+        rms.add(self.device)
+        return rms
 
     def _connect_object(self):
         device = self.device
-        if device and device.uuid not in self.connected:
+        if device.uuid not in self.connected:
             self.simulator.invoke(device.uuid, "SetMac", self.uuid)
             self._connected.add(device.uuid)