Changing default ns-3 and pybindgen versions

[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 25b9535..a52530f 100644 (file)
--- a/src/nepi/resources/linux/ns3/ns3simulation.py
+++ b/src/nepi/resources/linux/ns3/ns3simulation.py
@@ -32,6 +32,9 @@ import os
 import time
 import threading
 
+## TODO: Clean up DCE part. All that is DCE specific should go
+##       in the linux ns3dceapplication.py
+
 @clsinit_copy
 class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
     _rtype = "LinuxNS3Simulation"
@@ -94,6 +97,7 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
 
         pybindgen_version = Attribute("pybindgenVersion",
             "Version of pybindgen to install from bazar repo",
+            #default = "864", 
             default = "868", 
             flags = Flags.Design)
 
@@ -123,11 +127,6 @@ 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
-        
-        # Lock used to synchronize usage of DceManagerHelper 
-        self.dce_manager_lock = threading.Lock()
-        # Lock used to synchronize usage of DceApplicationHelper
-        self.dce_application_lock = threading.Lock()
 
     @property
     def socket_name(self):
@@ -137,14 +136,6 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
     def remote_socket(self):
         return os.path.join(self.run_home, self.socket_name)
 
-    @property
-    def dce_manager_helper_uuid(self):
-        return self._dce_manager_helper_uuid
-
-    @property
-    def dce_application_helper_uuid(self):
-        return self._dce_application_helper_uuid
-
     @property
     def ns3_build_home(self):
         return os.path.join(self.node.bin_dir, "ns-3", self.get("ns3Version"), 
@@ -187,6 +178,11 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
         src_dir = os.path.join(self.node.src_dir, "ns-3")
 
         super(LinuxNS3Simulation, self).upload_sources(src_dir = src_dir)
+    
+    def upload_extra_sources(self, sources = None, src_dir = None):
+        return super(LinuxNS3Simulation, self).upload_sources(
+                sources = sources, 
+                src_dir = src_dir)
 
     def upload_start_command(self):
         command = self.get("command")
@@ -225,10 +221,6 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
             stype = self.create("StringValue", sched_type)
             self.invoke(GLOBAL_VALUE_UUID, "Bind", "SchedulerType", btrue)
         
-        if self.get("enableDCE"):
-            self._dce_manager_helper_uuid = self.create("DceManagerHelper")
-            self._dce_application_helper_uuid = self.create("DceApplicationHelper")
-
     def do_deploy(self):
         if not self.node or self.node.state < ResourceState.READY:
             self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state )
@@ -349,8 +341,8 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
 
     @property
     def dce_repo(self):
-        #return "http://code.nsnam.org/ns-3-dce"
-        return "http://code.nsnam.org/epmancini/ns-3-dce"
+        return "http://code.nsnam.org/ns-3-dce"
+        #eturn "http://code.nsnam.org/epmancini/ns-3-dce"
 
     @property
     def _build(self):
@@ -545,14 +537,38 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
         env.append("PYTHONPATH=$PYTHONPATH:${NS3BINDINGS:=%(ns3_build_home)s/lib/python/site-packages}" % { 
                     'ns3_build_home': self.ns3_build_home
                  })
-        env.append("LD_LIBRARY_PATH=${NS3LIBRARIES:=%(ns3_build_home)s/lib/}" % { 
+        # If NS3LIBRARIES is defined and not empty, assign its value, 
+        # if not assign ns3_build_home/lib/ to NS3LIBRARIES and LD_LIBARY_PATH
+        env.append("LD_LIBRARY_PATH=${NS3LIBRARIES:=%(ns3_build_home)s/lib}" % { 
                     'ns3_build_home': self.ns3_build_home
                  })
-        env.append("DCE_PATH=$PATH:$NS3LIBRARIES/../bin_dce")
-        env.append("DCE_ROOT=$PATH:$NS3LIBRARIES/..")
+        env.append("DCE_PATH=$NS3LIBRARIES/../bin_dce")
+        env.append("DCE_ROOT=$NS3LIBRARIES/..")
 
         return " ".join(env) 
 
+    def replace_paths(self, command):
+        """
+        Replace all special path tags with shell-escaped actual paths.
+        """
+        return ( command
+            .replace("${USR}", self.node.usr_dir)
+            .replace("${LIB}", self.node.lib_dir)
+            .replace("${BIN}", self.node.bin_dir)
+            .replace("${SRC}", self.node.src_dir)
+            .replace("${SHARE}", self.node.share_dir)
+            .replace("${EXP}", self.node.exp_dir)
+            .replace("${EXP_HOME}", self.node.exp_home)
+            .replace("${APP_HOME}", self.app_home)
+            .replace("${RUN_HOME}", self.run_home)
+            .replace("${NODE_HOME}", self.node.node_home)
+            .replace("${HOME}", self.node.home_dir)
+            # If NS3LIBRARIES is defined and not empty, use that value, 
+            # if not use ns3_build_home/lib/
+            .replace("${BIN_DCE}", "${NS3LIBRARIES-%s/lib}/../bin_dce" % \
+                    self.ns3_build_home)
+            )
+
     def valid_connection(self, guid):
         # TODO: Validate!
         return True