ns-3 wifi example examples/linux/ns3/wifi_ping.py

[nepi.git] / src / nepi / resources / linux / ns3 / ns3simulation.py

diff --git a/src/nepi/resources/linux/ns3/ns3simulation.py b/src/nepi/resources/linux/ns3/ns3simulation.py
index 632d854..0f94c4c 100644 (file)
--- a/src/nepi/resources/linux/ns3/ns3simulation.py
+++ b/src/nepi/resources/linux/ns3/ns3simulation.py
@@ -20,7 +20,7 @@
 from nepi.execution.attribute import Attribute, Flags, Types
 from nepi.execution.trace import Trace, TraceAttr
 from nepi.execution.resource import ResourceManager, clsinit_copy, \
-        ResourceState, reschedule_delay
+        ResourceState, ResourceFactory, reschedule_delay
 from nepi.resources.linux.application import LinuxApplication
 from nepi.util.timefuncs import tnow, tdiffsec
 from nepi.resources.ns3.ns3simulation import NS3Simulation
@@ -76,6 +76,13 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
             type = Types.Bool,
             flags = Flags.Design)
 
+        enable_dump = Attribute("enableDump",
+            "Enable dumping the remote executed ns-3 commands to a script "
+            "in order to later reproduce and debug the experiment",
+            type = Types.Bool,
+            default = False,
+            flags = Flags.Design)
+
         build_mode = Attribute("buildMode",
             "Mode used to build ns-3 with waf. One if: debug, release, oprimized ",
             default = "optimized", 
@@ -105,6 +112,7 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
         cls._register_attribute(sched_type)
         cls._register_attribute(check_sum)
         cls._register_attribute(ns_log)
+        cls._register_attribute(enable_dump)
         cls._register_attribute(verbose)
         cls._register_attribute(build_mode)
         cls._register_attribute(ns3_version)
@@ -120,7 +128,7 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
         self._socket_name = "ns3-%s.sock" % os.urandom(4).encode('hex')
         self._dce_manager_helper_uuid = None
         self._dce_application_helper_uuid = None
-        self._enable_dce = False
+        self._enable_dce = None
 
     @property
     def socket_name(self):
@@ -150,6 +158,14 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
                 os.path.join(self.node.src_dir, "ns3wrapper", "ns3wrapper.py"),
                 overwrite = False)
 
+        # upload ns3 wrapper debug python script
+        ns3_wrapper_debug = os.path.join(os.path.dirname(__file__), "..", "..", "ns3", 
+                "ns3wrapper_debug.py")
+
+        self.node.upload(ns3_wrapper_debug,
+                os.path.join(self.node.src_dir, "ns3wrapper", "ns3wrapper_debug.py"),
+                overwrite = False)
+
         # upload ns3_server python script
         ns3_server = os.path.join(os.path.dirname(__file__), "..", "..", "ns3",
                 "ns3server.py")
@@ -271,7 +287,10 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
 
             self._client.start()
 
-            # Wait until the Simulation is actually started...
+            """
+            # XXX: IS THIS REALLY NEEDED??
+            # Wait until the Simulation is actually started... 
+
             is_running = False
             for i in xrange(1000):
                 is_running = self.invoke(SIMULATOR_UUID, "isRunning")
@@ -285,6 +304,7 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
                     msg = " Simulation did not start"
                     self.error(msg)
                     raise RuntimeError
+            """
 
             self.set_started()
         else:
@@ -342,6 +362,9 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
         if ns_log:
             command.append("-L '%s'" % ns_log)
 
+        if self.get("enableDump"):
+            command.append("-D")
+
         if self.get("verbose"):
             command.append("-v")