Changeset e2ff75d

Timestamp:

Jun 29, 2010 11:55:52 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

132440f

Parents:

183b208

Message:

Enable real plug-ins. I couldn't be happier at how small this diff is.

File:

• fedd/federation/deter_impl.py (modified) (3 diffs)

fedd/federation/deter_impl.py

@@ -1 +1 @@
 #!/usr/local/bin/python
+
+import sys
 
 import emulab_access
@@ -40 +42 @@
             self.access_type = config.get("globals", "access_type", "emulab")
             self.auth_type = config.get("globals", "auth_type", "legacy")
+
+            for mp in config.get("globals", "module_path","").split(":"):
+                sys.path.append(mp)
 
             if self.auth_type == 'legacy':
@@ -84 +89 @@
                     self.access = skeleton_access.access(config, self.auth)
                 else:
-                    raise RuntimeError("Unknown access_type: %s" % \
-                            self.access_type)
+                    try:
+                        exec 'from %s import access as plugin_access' \
+                                % self.access_type
+                        self.access = plugin_access(config, self.auth)
+                    except ImportError, e:
+                        raise RuntimeError(
+                                "Unknown access_type: %s (import failed: %s)" \
+                                        % (self.access_type, e))
                 self.soap_services.update(self.access.soap_services) 
                 self.xmlrpc_services.update(self.access.xmlrpc_services)