Changeset 5f6929a for fedd/federation/ns2topdl.py

Timestamp:

Apr 7, 2010 1:53:58 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

7fe81be

Parents:

3e3a5de

Message:

Two changes at once

Remove master and export project from the create request and rename the splitter external interface into a translation interface. The export_project pseudo service is staring.

Also start removeing some deprecated fields.

File:

• fedd/federation/ns2topdl.py (moved) (moved from fedd/federation/split.py) (6 diffs)

fedd/federation/ns2topdl.py

@@ -20 +20 @@
 fl.addHandler(nullHandler())
 
-class split_local:
+class ns2topdl_local:
     def __init__(self, config=None, auth=None):
         """
         Intialize the various attributes, most from the config object
         """
-        self.debug = config.getboolean("splitter", "debug")
-        self.muxmax = config.getint("splitter", "muxmax", 3)
-        self.tclsh = config.get("splitter", "tclsh", 
+        self.debug = config.getboolean("ns2topdl", "debug")
+        self.muxmax = config.getint("ns2topdl", "muxmax", 3)
+        self.tclsh = config.get("ns2topdl", "tclsh", 
                 "/usr/local/bin/otclsh")
-        self.tcl_splitter = config.get("splitter", "tcl_splitter",
+        self.tcl_splitter = config.get("ns2topdl", "tcl_splitter",
                 "/usr/testbed/lib/ns2ir/parse.tcl")
-        access_db = config.get("splitter", "accessdb", None)
-        allow_any = config.getboolean("splitter", "allow_any", False)
+        access_db = config.get("ns2topdl", "accessdb", None)
+        allow_any = config.getboolean("ns2topdl", "allow_any", False)
 
-        self.log = logging.getLogger("fedd.splitter")
-        set_log_level(config, "splitter", self.log)
+        self.log = logging.getLogger("fedd.ns2topdl")
+        set_log_level(config, "ns2topdl", self.log)
         self.trace_file = sys.stderr
 
-        set_log_level(config, "splitter", self.log)
+        set_log_level(config, "ns2topdl", self.log)
 
         if auth:
@@ -44 +44 @@
         else:
             self.auth = authorizer()
-            self.log.warning("[splitter] No authorizer passed in, " +\
+            self.log.warning("[ns2topdl] No authorizer passed in, " +\
                     "using local one")
 
@@ -50 +50 @@
             raise service_error(service_error.internal, 
                     "Cannot specify both an access database and allow_any " +\
-                            "for splitter")
+                            "for ns2topdl")
         
         if access_db:
             try:
-                read_simple_accessdb(access_db, self.auth, 'split')
+                read_simple_accessdb(access_db, self.auth, 'ns2topdl')
             except IOError, e:
                 raise service_error(service_error.internal,
@@ -61 +61 @@
                 raise service_error(service_error.internal, "%s" % e)
         elif allow_any:
-            auth.set_global_attribute("split")
+            auth.set_global_attribute("ns2topdl")
 
 
         # Dispatch tables
         self.soap_services = {\
-                'Ns2Split': soap_handler("Ns2Split", self.run_splitter),
+                'Ns2Topdl': soap_handler("Ns2Topdl", self.run_ns2topdl),
         }
 
         self.xmlrpc_services = {\
-                'Ns2Split': xmlrpc_handler('Ns2Split', self.run_splitter),
+                'Ns2Topdl': xmlrpc_handler('Ns2Topdl', self.run_ns2topdl),
         }
 
-    def run_splitter(self, req, fid):
+    def run_ns2topdl(self, req, fid):
         """
-        The external interface to experiment creation called from the
-        dispatcher.
+        The external interface to tcl to topdl translation.
 
-        Creates a working directory, splits the incoming description using the
-        splitter script and parses out the avrious subsections using the
-        lcasses above.  Once each sub-experiment is created, use pooled threads
-        to instantiate them and start it all up.
+        Creates a working directory, translates the incoming description using
+        the tcl script.
         """
 
-        if not self.auth.check_attribute(fid, 'split'):
+        if not self.auth.check_attribute(fid, 'ns2topdl'):
             raise service_error(service_error.access, "Access Denied")
 
         try:
-            tmpdir = tempfile.mkdtemp(prefix="split-")
+            tmpdir = tempfile.mkdtemp(prefix="ns2topdl-")
         except IOError:
             raise service_error(service_error.internal, "Cannot create tmp dir")
@@ -96 +93 @@
         gid = "dummy"
         eid = "dummy"
+        master = "dummy"
 
-        req = req.get('Ns2SplitRequestBody', None)
+        req = req.get('Ns2TopdlRequestBody', None)
         if not req:
             raise service_error(service_error.req,
-                    "Bad request format (no Ns2SplitRequestBody)")
+                    "Bad request format (no Ns2TopdlRequestBody)")
         # The tcl parser needs to read a file so put the content into that file
         descr=req.get('description', None)
@@ -119 +117 @@
             raise service_error(service_error.req, "No description")
 
-        master = req.get('master', None)
-        if master == None:
-            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, '-t', '-x', 
             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))