Adding compilation of DCE sources

[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..491cd91 100644 (file)
--- a/src/nepi/resources/ns3/ns3node.py
+++ b/src/nepi/resources/ns3/ns3node.py
@@ -17,23 +17,36 @@
 #
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
+from nepi.execution.attribute import Attribute, Flags, Types
 from nepi.execution.resource import clsinit_copy
 from nepi.resources.ns3.ns3base import NS3Base
-from nepi.resources.ns3.ns3simulator import NS3Simulator
 
 @clsinit_copy
 class NS3BaseNode(NS3Base):
     _rtype = "abstract::ns3::Node"
 
+    @classmethod
+    def _register_attributes(cls):
+        enable_dce = Attribute("enableDCE", 
+                "This node will run in DCE emulation mode ",
+                default = False,
+                type = Types.Bool,
+                flags = Flags.Design)
+
+        cls._register_attribute(enable_dce)
+
     @property
-    def simulator(self):
+    def simulation(self):
+        from nepi.resources.ns3.ns3simulation import NS3Simulation
         for guid in self.connections:
             rm = self.ec.get_resource(guid)
-            if isinstance(rm, NS3Simulator):
+            if isinstance(rm, NS3Simulation):
                 return rm
 
-        return None
-
+        msg = "Node not connected to simulation"
+        self.error(msg)
+        raise RuntimeError, msg
+ 
     @property
     def ipv4(self):
         from nepi.resources.ns3.ns3ipv4l3protocol import NS3BaseIpv4L3Protocol
@@ -42,11 +55,82 @@ class NS3BaseNode(NS3Base):
         return None
 
     @property
-    def others_to_wait(self):
-        return set()
+    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)
+
+        if self.get("enableDCE") == True:
+            self._add_dce()
+
+    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)
+
+    def _add_dce(self):
+        # TODO: All these component types should be configurable somewhere
+        """
+        manager_uuid = self.simulation.create("ns3::TaskManager")
+        m_schedulerFactory.SetTypeId ("ns3::RrTaskScheduler");
+        m_managerFactory.SetTypeId ("ns3::DceManager");
+        m_networkStackFactory.SetTypeId ("ns3::Ns3SocketFdFactory");
+        m_delayFactory.SetTypeId ("ns3::RandomProcessDelayModel");
+
+         Ptr<TaskManager> taskManager = m_taskManagerFactory.Create<TaskManager> ();
+         Ptr<TaskScheduler> scheduler = m_schedulerFactory.Create<TaskScheduler> ();
+         Ptr<LoaderFactory> loader = m_loaderFactory.Create<LoaderFactory> ();
+         Ptr<SocketFdFactory> networkStack = m_networkStackFactory.Create<SocketFdFactory> ();
+         Ptr<ProcessDelayModel> delay = m_delayFactory.Create<ProcessDelayModel> ();
+
+         taskManager->SetScheduler (scheduler);
+         taskManager->SetDelayModel (delay);
+         manager->SetAttribute ("FirstPid", UintegerValue (g_firstPid.GetInteger (0, 0xffff)));
+         Ptr<Node> node = *i;
+         node->AggregateObject (taskManager);
+         node->AggregateObject (loader);
+         node->AggregateObject (manager);
+         node->AggregateObject (networkStack);
+         node->AggregateObject (CreateObject<LocalSocketFdFactory> ());
+         manager->AggregateObject (CreateObject<DceNodeContext> ());
+         manager->SetVirtualPath (GetVirtualPath ());
+        """
+        pass