Changeset b8a9fb7

Timestamp:

Jun 1, 2009 10:37:59 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:

b535e19

Parents:

222290f

Message:

Make the fedkit and gatewaykit configuration parameters into lists of destination directories and tarfiles rather than a single tarfile.

File:

• fedd/federation/experiment_control.py (modified) (7 diffs)

fedd/federation/experiment_control.py

@@ -165 +165 @@
         Intialize the various attributes, most from the config object
         """
+
+        def parse_tarfile_list(tf):
+            """
+            Parse a tarfile list from the configuration.  This is a set of
+            paths and tarfiles separated by spaces.
+            """
+            rv = [ ]
+            if tf is not None:
+                tl = tf.split()
+                while len(tl) > 1:
+                    p, t = tl[0:2]
+                    del tl[0:2]
+                    rv.append((p, t))
+            return rv
+
         self.thread_with_rv = experiment_control_local.pooled_thread
         self.thread_pool = experiment_control_local.thread_pool
@@ -196 +211 @@
                 "experiment_state")
         self.splitter_url = config.get("experiment_control", "splitter_uri")
-        self.fedkit = config.get("experiment_control", "fedkit")
-        self.gatewaykit = config.get("experiment_control", "gatewaykit")
+        self.fedkit = parse_tarfile_list(\
+                config.get("experiment_control", "fedkit"))
+        self.gatewaykit = parse_tarfile_list(\
+                config.get("experiment_control", "gatewaykit"))
         accessdb_file = config.get("experiment_control", "accessdb")
 
@@ -1093 +1110 @@
         """
         def __init__(self, eid, tmpdir, fedkit, gatewaykit):
+            def tar_list_to_string(tl):
+                if tl is None: return None
+
+                rv = ""
+                for t in tl:
+                    rv += " %s PROJDIR/tarfiles/EID/%s" % \
+                            (t[0], os.path.basename(t[1]))
+                return rv
+
+
             self.begin_testbed = re.compile("^#\s+Begin\s+Testbed\s+\((\w+)\)")
             self.end_testbed = re.compile("^#\s+End\s+Testbed\s+\((\w+)\)")
@@ -1114 +1141 @@
             self.eid = eid
             self.tmpdir = tmpdir
-            self.fedkit = fedkit
-            self.gatewaykit = gatewaykit
+            # Convert fedkit and gateway kit (which are lists of tuples) into a
+            # substituition string.
+            self.fedkit = tar_list_to_string(fedkit)
+            self.gatewaykit = tar_list_to_string(gatewaykit)
 
         def __call__(self, line, master, allocated, tbparams):
@@ -1190 +1219 @@
                         line = re.sub("GWCMDPARAMS", gwcmdparams, line)
                         line = re.sub("(#\s*)?GWCMD", gwcmd, line)
+                    #These expansions contain EID and PROJDIR.  NB these are
+                    # local fedkit and gatewaykit, which are strings.
+                    if self.fedkit:
+                        line = re.sub("FEDKIT", self.fedkit, line)
+                    if self.gatewaykit:
+                        line = re.sub("GATEWAYKIT", self.gatewaykit, line)
                     line = re.sub("GWCONF", "FEDDIR`hostname`.gw.conf", line)
                     line = re.sub("PROJDIR", "/proj/%s/" % project, line)
@@ -1195 +1230 @@
                     line = re.sub("FEDDIR", "/proj/%s/exp/%s/tmp/" % \
                             (project, self.eid), line)
-                    if self.fedkit:
-                        line = re.sub("FEDKIT", os.path.basename(self.fedkit),
-                                line)
-                    if self.gatewaykit:
-                        line = re.sub("GATEWAYKIT",
-                                os.path.basename(self.gatewaykit), line)
                     print >>self.testbed_file, line
                 return True
@@ -1730 +1759 @@
             try:
                 if self.fedkit:
-                    parse_tarfiles.list.append(self.fedkit)
+                    for t in self.fedkit:
+                        parse_tarfiles.list.append(t[1])
                 if self.gatewaykit:
-                    parse_tarfiles.list.append(self.gatewaykit)
+                    for t in self.gatewaykit:
+                        parse_tarfiles.list.append(t[1])
                 for t in parse_tarfiles.list:
                     if not os.path.exists("%s/tarfiles" % tmpdir):