Changeset 4fc2250 for fedd/fedd_create_experiment.py

Timestamp:

Sep 5, 2008 4:08:19 PM (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:

987aaa1

Parents:

bcbf543

Message:

add slice/experiment name

File:

• fedd/fedd_create_experiment.py (modified) (1 diff)

fedd/fedd_create_experiment.py

@@ -1236 +1236 @@
                 print >>self.trace_file, "Experiment started"
 
+        # Generate an ID for the experiment (slice) and a certificate that the
+        # allocator can use to prove they own it.  We'll ship it back through
+        # the encrypted connection.
+        (expid, expcert) = generate_fedid("test", dir=tmpdir, 
+                trace=self.trace_file)
+
+        if self.trace_file:
+            print >>self.trace_file, "removing %s" % tmpdir
+
+        # Walk up tmpdir, deleting as we go
+        for path, dirs, files in os.walk(tmpdir, topdown=False):
+            for f in files:
+                os.remove(os.path.join(path, f))
+            for d in dirs:
+                os.rmdir(os.path.join(path, d))
+        os.rmdir(tmpdir)
+        
         return { 'emulab' : [ tbparams[tb]['emulab'] \
                 for tb in tbparams.keys() \
                     if tbparams[tb].has_key('emulab') ],\
                     'experiment': vtopo,\
-                    'vis' : vis }
+                    'vis' : vis,
+                    'experimentID' : { 'fedid': expid },\
+                    'experimentAccess': { 'X509' : expcert },\
+                }
 
 if __name__ == '__main__':