Changeset 2c6128f for fedd/fedd_split.py

Timestamp:

Nov 5, 2008 1:37:28 AM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

9c166cf

Parents:

01308c9

Message:

Add support for a real fedkit tar file rather than the ad hoc script stuff.

File:

• fedd/fedd_split.py (modified) (3 diffs)

fedd/fedd_split.py

@@ -35 +35 @@
     def emit(self, record): pass
 
-fl = logging.getLogger("fedd.experiment_control")
+fl = logging.getLogger("fedd.splitter")
 fl.addHandler(nullHandler())
 
@@ -46 +46 @@
             self.debug = config.getboolean("splitter", "debug")
             self.muxmax = config.getint("splitter", "muxmax", 3)
+            self.tclsh = config.get("splitter", "tclsh", 
+                    "/usr/local/bin/otclsh")
+            self.tcl_splitter = config.get("splitter", "tcl_splitter",
+                    "/usr/testbed/lib/ns2ir/parse.tcl")
         else:
             self.debug = False
             self.muxmax = 3
+            self.tclsh = "/usr/local/bin/otclsh"
+            self.tcl_splitter = "/usr/testbed/lib/ns2ir/parse.tcl"
 
         self.log = logging.getLogger("fedd.splitter")
-        self.tclsh = "/usr/local/bin/otclsh"
-        self.tcl_splitter = "/usr/testbed/lib/ns2ir/parse.tcl"
         self.trace_file = sys.stderr
 
+        set_log_level(config, "splitter", self.log)
         # Dispatch tables
         self.soap_services = {\
@@ -116 +121 @@
             raise service_error(service_error.req, "No master testbed label")
         
+        include_fedkit = req.get('include_fedkit', None)
+        if include_fedkit == None:
+            raise service_error(service_error.req, 
+                    "No federation kit inclusion directive")
+        
         
         tclcmd = [self.tclsh, self.tcl_splitter, '-s', '-x', 
-            str(self.muxmax), '-m', master, pid, gid, eid, tclfile]
+            str(self.muxmax), '-m', master]
+        if include_fedkit: tclcmd.append('-k')
+        tclcmd.extend([pid, gid, eid, tclfile])
+        self.log.debug("Calling splitter %s" % " ".join(tclcmd))
         tclparser = Popen(tclcmd, stdout=PIPE)