Fixes ns-3/DCE

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

diff --git a/src/nepi/resources/linux/ns3/ns3dceapplication.py b/src/nepi/resources/linux/ns3/ns3dceapplication.py
index bf1a6e3..8d197b9 100644 (file)
--- a/src/nepi/resources/linux/ns3/ns3dceapplication.py
+++ b/src/nepi/resources/linux/ns3/ns3dceapplication.py
@@ -41,32 +41,32 @@ class NS3LinuxDceApplication(NS3BaseDceApplication):
                 "binaries to the ${BIN_DCE} directory. ",
                 flags = Flags.Design)
 
-        starttime = Attribute("StartTime",
-            "Time at which the application will start",
-            default = "+0.0ns",  
-            flags = Flags.Reserved | Flags.Construct)
-
-
-        stoptime = Attribute("StopTime",
-            "Time at which the application will stop",
-            default = "+0.0ns",  
-            flags = Flags.Reserved | Flags.Construct)
+        depends = Attribute("depends", 
+                "Space-separated list of packages required to run the application",
+                flags = Flags.Design)
 
         cls._register_attribute(sources)
         cls._register_attribute(build)
-        cls._register_attribute(stoptime)
-        cls._register_attribute(starttime)
+        cls._register_attribute(depends)
 
     def _instantiate_object(self):
         command = []
-        
+
+        # Install package dependencies required to run the binary 
+        depends = self.get("depends")
+        if depends:
+            dcmd = self.simulation.install_dependencies(depends = depends)
+            if dcmd:
+                command.append(dcmd)
+       
+        # Upload sources to generate the binary
         sources = self.get("sources")
         if sources:
-            self.info("Uploading sources %s " % sources)
             scmd = self.simulation.upload_extra_sources(sources = sources)
             if scmd:
                 command.append(scmd)
                 
+        # Upload instructions to build the binary
         build = self.get("build")
         if build:
             bcmd = self.simulation.build(build = build)