enable automatic node stack

[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 dded05f..8598979 100644 (file)
--- a/src/nepi/resources/ns3/ns3node.py
+++ b/src/nepi/resources/ns3/ns3node.py
@@ -27,13 +27,14 @@ class NS3BaseNode(NS3Base):
 
     @classmethod
     def _register_attributes(cls):
-        enable_dce = Attribute("enableDCE", 
-                "This node will run in DCE emulation mode ",
-                default = False,
+        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(enable_dce)
+        cls._register_attribute(enablestack)
 
     @property
     def simulation(self):
@@ -73,6 +74,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()
@@ -89,12 +97,17 @@ 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("enableDCE") == True:
-            self._add_dce()
+        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
@@ -105,9 +118,12 @@ class NS3BaseNode(NS3Base):
         if mobility:
             self.simulation.invoke(self.uuid, "AggregateObject", mobility.uuid)
 
-    def _add_dce(self):
+    def _add_dce(self, dceapplications):
+        dceapp = dceapplications[0]
+
         container_uuid = self.simulation.create("NodeContainer")
         self.simulation.invoke(container_uuid, "Add", self.uuid)
-        self.simulation.invoke(self.simulation.dce_helper_uuid, "Install", 
-                container_uuid)
+        with dceapp.dce_manager_lock:
+            self.simulation.invoke(dceapp.dce_manager_helper_uuid, 
+                    "Install", container_uuid)