Changeset 4fc2250

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

Location:

fedd

Files:

• fedd_create_experiment.py (modified) (1 diff)
• fedd_types.xsd (modified) (1 diff)
• fedd_util.py (modified) (2 diffs)

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__':

fedd/fedd_types.xsd

@@ -319 +319 @@
         maxOccurs="1"/>
       <xsd:element name="vis" type="tns:visType" minOccurs="0"
+        maxOccurs="1"/>
+      <xsd:element name="experimentID" type="tns:IDType"/>
+      <xsd:element name="experimentAccess" type="tns:accessType" minOccurs="0"
         maxOccurs="1"/>
     </xsd:sequence>

fedd/fedd_util.py

@@ -1 +1 @@
 #!/usr/local/bin/python
 
-import sys
+import os, sys
+import subprocess
+import tempfile
 
 from M2Crypto import SSL, X509, EVP
@@ -225 +227 @@
     else: 
         return element
+
+def generate_fedid(subj, bits=2048, trace=None, dir=None):
+    """
+    Create a new certificate and derive a fedid from it.
+
+    The fedid and the certificte are returned as a tuple.
+    """
+
+    keypath = None
+    certpath = None
+    try:
+        try:
+            kd, keypath = tempfile.mkstemp(dir=dir, prefix="key",
+                    suffix=".pem")
+            cd, certpath = tempfile.mkstemp(dir=dir, prefix="cert",
+                    suffix=".pem")
+
+            cmd = ["openssl", "req", "-text", "-newkey", "rsa:%d" % bits, 
+                    "-keyout", keypath,  "-nodes", "-subj", "/CN=%s" % subj,
+                    "-x509", "-days", "30", "-out", certpath]
+
+            if trace:
+                print >>trace, "calling %s" % " ".join(cmd)
+                call_out = trace
+            else:
+                call_out = open("/dev/null", "w")
+                
+            rv = subprocess.call(cmd, stdout=call_out, stderr=call_out)
+            if rv == 0:
+                cert = ""
+                for p in (certpath, keypath):
+                    f = open(p)
+                    for line in f:
+                        cert += line
+                
+                fid = fedid(file=certpath)
+                return (fid, cert)
+            else:
+                return None
+        except IOError, e:
+            raise e
+    finally:
+        if keypath: os.remove(keypath)
+        if certpath: os.remove(certpath)