Changeset a20a20f for fedd

Timestamp:

May 28, 2010 10:10:58 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

623a2c9

Parents:

6abed7b

Message:

Pluggable exports and add directory removal to the base class

File:

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

fedd/federation/emulab_access.py

@@ -107 +107 @@
         if config.has_option("access", "accessdb"):
             self.read_access(config.get("access", "accessdb"))
-
-        if not self.local_seer_image or not self.local_seer_software:
-            self.exports.discard('local_seer_control')
-            self.exports.discard('seer_master')
-
-        if not self.local_seer_start:
-            self.exports.discard('local_seer_control')
-
-        if not self.seer_master_start:
-            self.exports.discard('seer_master')
-
         tb = config.get('access', 'testbed')
         if tb: self.testbed = [ t.strip() for t in tb.split(',') ]
@@ -146 +135 @@
                 self.auth.set_attribute(fid, "/%s" % sfid)
         self.state_lock.release()
+        self.exports = {
+                'SMB': self.export_SMB,
+                'seer': self.export_seer,
+                'tmcd': self.export_tmcd,
+                'userconfig': self.export_userconfig,
+                'project_export': self.export_project_export,
+                'local_seer_control': self.export_local_seer,
+                'seer_master': self.export_seer_master,
+                'hide_hosts': self.export_hide_hosts,
+                }
+
+        if not self.local_seer_image or not self.local_seer_software or \
+                not self.local_seer_start:
+            if 'local_seer_control' in self.exports:
+                del self.exports['local_seer_control']
+
+        if not self.local_seer_image or not self.local_seer_software or \
+                not self.seer_master_start:
+            if 'seer_master' in self.exports:
+                del self.exports['seer_master']
 
 
@@ -760 +769 @@
                     continue
 
-
-    def configure_userconf(self, services, tmpdir):
-        """
-        If the userconf service was imported, collect the configuration data.
-        """
-        for s in services:
-            s_name = s.get('name', '')
-            s_vis = s.get('visibility','')
-            if s_name  == 'userconfig' and s_vis == 'import':
-                # Collect ther server and certificate info.
-                u = s.get('server', None)
-                for a in s.get('fedAttr', []):
-                    if a.get('attribute',"") == 'cert':
-                        cert = a.get('value', None)
-                        break
-                else:
-                    cert = None
-
-                if cert:
-                    # Make a temporary certificate file for get_url.  The
-                    # finally clause removes it whether something goes
-                    # wrong (including an exception from get_url) or not.
-                    try:
-                        tfos, tn = tempfile.mkstemp(suffix=".pem")
-                        tf = os.fdopen(tfos, 'w')
-                        print >>tf, cert
-                        tf.close()
-                        self.log.debug("Getting userconf info: %s" % u)
-                        get_url(u, tn, tmpdir, "userconf")
-                        self.log.debug("Got userconf info: %s" % u)
-                    except EnvironmentError, e:
-                        raise service_error(service.error.internal, 
-                                "Cannot create temp file for " + 
-                                "userconfig certificates: %s" % e)
-                    except:
-                        t, v, st = sys.exc_info()
-                        raise service_error(service_error.internal,
-                                "Error retrieving %s: %s" % (u, v))
-                    finally:
-                        if tn: os.remove(tn)
-                else:
-                    raise service_error(service_error.req,
-                            "No certificate for retreiving userconfig")
-                break
-
     def add_seer_node(self, topo, name, startup):
         """
@@ -1005 +969 @@
         self.state_lock.release()
         return retval
-
-    def remove_dirs(self, dir):
-        """
-        Remove the directory tree and all files rooted at dir.  Log any errors,
-        but continue.
-        """
-        self.log.debug("[removedirs]: removing %s" % dir)
-        try:
-            for path, dirs, files in os.walk(dir, 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(dir)
-        except EnvironmentError, e:
-            self.log.error("Error deleting directory tree in %s" % e);
     
     # End of StartSegment support routines