Changeset fe28bb2 for fedd

Timestamp:

Feb 13, 2010 2:42:32 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

94a00cb

Parents:

dac2316

Message:

Access controllers importing userconfig will download the file containingthe
configuration now.

File:

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

fedd/federation/emulab_access.py

@@ -71 +71 @@
         self.userconfdir = config.get("access","userconfdir")
         self.userconfcmd = config.get("access","userconfcmd")
+        self.userconfurl = config.get("access","userconfurl")
         self.ssh_privkey_file = config.get("access","ssh_privkey_file")
         self.ssh_pubkey_file = config.get("access","ssh_pubkey_file")
@@ -326 +327 @@
                     self.auth.set_attribute(o, fedid(hexstr=k))
                 if self.allocation[k].has_key('userconfig'):
-                    sfid = hexstr=self.allocation[k]['userconfig']
+                    sfid = self.allocation[k]['userconfig']
                     fid = fedid(hexstr=sfid)
-                    self.auth.set_attribute(fid, sfid)
+                    self.auth.set_attribute(fid, "/%s" % sfid)
 
 
@@ -525 +526 @@
                 stdout=cf, stderr=dev_null, close_fds=True)
 
-        self.auth.set_attribute(confid, str(confid))
+        self.auth.set_attribute(confid, "/%s" % str(confid))
 
         return confid, confcert
@@ -554 +555 @@
                         outs['server'] = "http://boss:7777"
                     elif sname == 'userconfig':
-                        if self.userconfdir and self.userconfcmd:
+                        if self.userconfdir and self.userconfcmd \
+                                and self.userconfurl:
                             cid, cert = self.export_userconf(project)
-                            outs['server'] = "%s/%s" %(self.testbed, str(cid))
+                            outs['server'] = "%s/%s" % \
+                                    (self.userconfurl, str(cid))
                             outs['fedAttr'] = [
                                     { 'attribute': 'cert', 'value': cert },
@@ -1148 +1151 @@
 
     def StartSegment(self, req, fid):
-        def get_url(url, cf, destdir):
+        def get_url(url, cf, destdir, fn=None):
             po = urlparse(url)
-            fn = po.path.rpartition('/')[2]
+            if not fn:
+                fn = po.path.rpartition('/')[2]
             try:
                 conn = httplib.HTTPSConnection(po.hostname, port=po.port, 
@@ -1165 +1169 @@
                 lf.close()
             except IOError, e:
+                print e
                 raise service_error(service_error.internal,
-                        "Erro writing tempfile: %s" %e)
+                        "Error writing tempfile: %s" %e)
             except httplib.HTTPException, e:
+                print e
                 raise service_error(service_error.internal, 
                         "Error retrieving data: %s" % e)
@@ -1227 +1233 @@
                 if a['attribute'] == 'experiment_name':
                     ename = a['value']
+
+            # If the userconf service was imported, collect the configuration
+            # data.
+            for s in services:
+                if s.get("name", "") == 'userconfig' \
+                        and s.get('visibility',"") == 'import':
+                    u = s.get('server', None)
+                    print "url %s" % u
+                    for a in s.get('fedAttr', []):
+                        if a.get('attribute',"") == 'cert':
+                            cert = a.get('value', None)
+                            break
+                    else:
+                        cert = None
+
+                    if not cert:
+                        raise service_error(service_error.req,
+                                "No certificate for retreiving userconfig")
+                    try:
+                        tfos, tn = tempfile.mkstemp(suffix=".pem")
+                        tf = os.fdopen(tfos, 'w')
+                        print >>tf, cert
+                        tf.close()
+                        print "tn %s" % tn
+                        get_url(u, tn, tmpdir, "userconf")
+                    except IOError, e:
+                        raise service_error(service.error.internal, 
+                                "Cannot create temp file for " + 
+                                "userconfig certificates: %s e")
+                    finally:
+                        if tn: os.remove(tn)
+                    break
+
+
 
             proj = None