Fixes ns-3/DCE

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

diff --git a/src/nepi/resources/ns3/ns3dceapplication.py b/src/nepi/resources/ns3/ns3dceapplication.py
index b2dc465..7d26fbd 100644 (file)
--- a/src/nepi/resources/ns3/ns3dceapplication.py
+++ b/src/nepi/resources/ns3/ns3dceapplication.py
@@ -21,6 +21,8 @@ from nepi.execution.attribute import Attribute, Flags, Types
 from nepi.execution.resource import clsinit_copy, ResourceState, reschedule_delay
 from nepi.resources.ns3.ns3application import NS3BaseApplication
 
+import os
+
 @clsinit_copy
 class NS3BaseDceApplication(NS3BaseApplication):
     _rtype = "abstract::ns3::DceApplication"
@@ -41,9 +43,27 @@ class NS3BaseDceApplication(NS3BaseApplication):
                 "Semi-colon separated list of arguments for the application",
                 flags = Flags.Design)
 
+        environment = Attribute("environment", 
+                "Semi-colon separated list of 'key=value' pairs to set as "
+                "DCE environment variables.",
+                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)
+
         cls._register_attribute(binary)
         cls._register_attribute(stack_size)
         cls._register_attribute(arguments)
+        cls._register_attribute(environment)
+        cls._register_attribute(stoptime)
+        cls._register_attribute(starttime)
 
     @property
     def node(self):
@@ -71,21 +91,39 @@ class NS3BaseDceApplication(NS3BaseApplication):
             # Preventing concurrent access to the DceApplicationHelper
             # from different DceApplication RMs
             with self.simulation.dce_application_lock:
-                self.simulation.invoke(self.simulation.dce_application_helper_uuid, 
+                self.simulation.invoke(
+                        self.simulation.dce_application_helper_uuid, 
                         "ResetArguments") 
 
-                self.simulation.invoke(self.simulation.dce_application_helper_uuid, 
+                self.simulation.invoke(
+                        self.simulation.dce_application_helper_uuid, 
+                        "ResetEnvironment") 
+
+                self.simulation.invoke(
+                        self.simulation.dce_application_helper_uuid, 
                         "SetBinary", self.get("binary")) 
 
-                self.simulation.invoke(self.simulation.dce_application_helper_uuid, 
+                self.simulation.invoke(
+                        self.simulation.dce_application_helper_uuid, 
                         "SetStackSize", self.get("stackSize")) 
 
-                arguments = self.get("arguments") or ""
-                for arg in map(str.strip, arguments.split(";")):
-                    self.simulation.invoke(self.simulation.dce_application_helper_uuid, 
-                        "AddArgument", arg) 
-
-                apps_uuid = self.simulation.invoke(self.simulation.dce_application_helper_uuid, 
+                arguments = self.get("arguments")
+                if arguments:
+                    for arg in map(str.strip, arguments.split(";")):
+                        self.simulation.invoke(
+                                self.simulation.dce_application_helper_uuid, 
+                            "AddArgument", arg)
+
+                environment = self.get("environment")
+                if environment:
+                    for env in map(str.strip, environment.split(";")):
+                        key, val = env.split("=")
+                        self.simulation.invoke(
+                                self.simulation.dce_application_helper_uuid, 
+                            "AddEnvironment", key, val)
+
+                apps_uuid = self.simulation.invoke(
+                        self.simulation.dce_application_helper_uuid, 
                         "InstallInNode", self.node.uuid)
 
             self._uuid = self.simulation.invoke(apps_uuid, "Get", 0)