Fixing ns-3 DCE tests

[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 0d6f691..aadcf40 100644 (file)
--- a/src/nepi/resources/ns3/ns3node.py
+++ b/src/nepi/resources/ns3/ns3node.py
@@ -17,6 +17,7 @@
 #
 # 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
 
@@ -24,6 +25,17 @@ from nepi.resources.ns3.ns3base import NS3Base
 class NS3BaseNode(NS3Base):
     _rtype = "abstract::ns3::Node"
 
+    @classmethod
+    def _register_attributes(cls):
+        enablestack = Attribute("enableStack", 
+                "Install network stack in Node, including: ARP, "
+                "IP4, ICMP, UDP and TCP ",
+                type = Types.Bool,
+                default = False,
+                flags = Flags.Design)
+
+        cls._register_attribute(enablestack)
+
     @property
     def simulation(self):
         from nepi.resources.ns3.ns3simulation import NS3Simulation
@@ -43,6 +55,13 @@ class NS3BaseNode(NS3Base):
         if ipv4s: return ipv4s[0]
         return None
 
+    @property
+    def arp(self):
+        from nepi.resources.ns3.ns3arpl3protocol import NS3BaseArpL3Protocol
+        arps = self.get_connected(NS3BaseArpL3Protocol.get_rtype())
+        if arps: return arps[0]
+        return None
+
     @property
     def mobility(self):
         from nepi.resources.ns3.ns3mobilitymodel import NS3BaseMobilityModel
@@ -62,6 +81,13 @@ class NS3BaseNode(NS3Base):
 
         return devices
 
+    @property
+    def dceapplications(self):
+        from nepi.resources.ns3.ns3dceapplication import NS3BaseDceApplication
+        dceapplications = self.get_connected(NS3BaseDceApplication.get_rtype())
+
+        return dceapplications
+
     @property
     def _rms_to_wait(self):
         rms = set()
@@ -71,6 +97,10 @@ class NS3BaseNode(NS3Base):
         if ipv4:
             rms.add(ipv4)
 
+        arp = self.arp
+        if arp:
+            rms.add(arp)
+
         mobility = self.mobility
         if mobility:
             rms.add(mobility)
@@ -78,17 +108,43 @@ class NS3BaseNode(NS3Base):
         return rms
 
     def _configure_object(self):
-        ### node.AggregateObject(PacketSocketFactory())
-        uuid_packet_socket_factory = self.simulation.create("PacketSocketFactory")
-        self.simulation.invoke(self.uuid, "AggregateObject", uuid_packet_socket_factory)
+        if self.get("enableStack"):
+            uuid_stack_helper = self.simulation.create("InternetStackHelper")
+            self.simulation.invoke(uuid_stack_helper, "Install", self.uuid)
+        else:
+            ### node.AggregateObject(PacketSocketFactory())
+            uuid_packet_socket_factory = self.simulation.create("PacketSocketFactory")
+            self.simulation.invoke(self.uuid, "AggregateObject", uuid_packet_socket_factory)
+
+        dceapplications = self.dceapplications
+        if dceapplications:
+            self._add_dce(dceapplications)
 
     def _connect_object(self):
         ipv4 = self.ipv4
         if ipv4:
             self.simulation.invoke(self.uuid, "AggregateObject", ipv4.uuid)
+            self._connected.add(ipv4.uuid)
+            ipv4._connected.add(self.uuid)
+
+        arp = self.arp
+        if arp:
+            self.simulation.invoke(self.uuid, "AggregateObject", arp.uuid)
+            self._connected.add(arp.uuid)
+            arp._connected.add(self.uuid)
 
         mobility = self.mobility
         if mobility:
             self.simulation.invoke(self.uuid, "AggregateObject", mobility.uuid)
+            self._connected.add(mobility.uuid)
+            mobility._connected.add(self.uuid)
+
+    def _add_dce(self, dceapplications):
+        dceapp = dceapplications[0]
 
+        container_uuid = self.simulation.create("NodeContainer")
+        self.simulation.invoke(container_uuid, "Add", self.uuid)
+        with dceapp.dce_manager_lock:
+            self.simulation.invoke(dceapp.dce_manager_helper_uuid, 
+                    "Install", container_uuid)