Fix #126 Routes configuration

[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 0e78bb0..0d6f691 100644 (file)
--- a/src/nepi/resources/ns3/ns3node.py
+++ b/src/nepi/resources/ns3/ns3node.py
@@ -21,15 +21,74 @@ from nepi.execution.resource import clsinit_copy
 from nepi.resources.ns3.ns3base import NS3Base
 
 @clsinit_copy
-class NS3BaseNode(Ns3Base):
-    _rtype = "ns3::Node"
+class NS3BaseNode(NS3Base):
+    _rtype = "abstract::ns3::Node"
 
     @property
-    def others_to_wait(self):
-        return set()
+    def simulation(self):
+        from nepi.resources.ns3.ns3simulation import NS3Simulation
+        for guid in self.connections:
+            rm = self.ec.get_resource(guid)
+            if isinstance(rm, NS3Simulation):
+                return rm
+
+        msg = "Node not connected to simulation"
+        self.error(msg)
+        raise RuntimeError, msg
+ 
+    @property
+    def ipv4(self):
+        from nepi.resources.ns3.ns3ipv4l3protocol import NS3BaseIpv4L3Protocol
+        ipv4s = self.get_connected(NS3BaseIpv4L3Protocol.get_rtype())
+        if ipv4s: return ipv4s[0]
+        return None
+
+    @property
+    def mobility(self):
+        from nepi.resources.ns3.ns3mobilitymodel import NS3BaseMobilityModel
+        mobility = self.get_connected(NS3BaseMobilityModel.get_rtype())
+        if mobility: return mobility[0]
+        return None
+
+    @property
+    def devices(self):
+        from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice
+        devices = self.get_connected(NS3BaseNetDevice.get_rtype())
+
+        if not devices: 
+            msg = "Node not connected to devices"
+            self.error(msg)
+            raise RuntimeError, msg
+
+        return devices
+
+    @property
+    def _rms_to_wait(self):
+        rms = set()
+        rms.add(self.simulation)
+
+        ipv4 = self.ipv4
+        if ipv4:
+            rms.add(ipv4)
+
+        mobility = self.mobility
+        if mobility:
+            rms.add(mobility)
+
+        return rms
 
     def _configure_object(self):
         ### node.AggregateObject(PacketSocketFactory())
-        uuid_packet_socket_factory = self.simulator.create("PacketSocketFactory")
-        self.simulator.invoke(self.uuid, "AggregateObject", uuid_packet_socket_factory)
+        uuid_packet_socket_factory = self.simulation.create("PacketSocketFactory")
+        self.simulation.invoke(self.uuid, "AggregateObject", uuid_packet_socket_factory)
+
+    def _connect_object(self):
+        ipv4 = self.ipv4
+        if ipv4:
+            self.simulation.invoke(self.uuid, "AggregateObject", ipv4.uuid)
+
+        mobility = self.mobility
+        if mobility:
+            self.simulation.invoke(self.uuid, "AggregateObject", mobility.uuid)
+