Changeset 3c6dbec

Timestamp:

Sep 9, 2009 10:45:40 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

32e7d93

Parents:

11860f52

Message:

Make space for other access plugins

Location:

fedd/federation

Files:

• deter_impl.py (modified) (3 diffs)
• emulab_access.py (moved) (moved from fedd/federation/access.py)

fedd/federation/deter_impl.py

@@ -1 +1 @@
 #!/usr/local/bin/python
 
-from access import access
+import emulab_access
 from experiment_control import experiment_control_local
 from split import split_local
@@ -32 +32 @@
             self.cert_pwd = config.get("globals", "cert_pwd");
             self.trusted_certs = config.get("globals", "trusted_certs");
+            self.access_type = config.get("globals", "access_type", "emulab")
 
             access_db = config.get("globals", "accessdb")
@@ -45 +46 @@
 
             if config.has_section("access"):
-                self.access = access(config, self.auth)
+                if self.access_type == "emulab":
+                    self.access = emulab_access.access(config, self.auth)
+                else:
+                    raise RuntimeError("Unknown access_type: %s" % \
+                            self.access_type)
                 self.soap_services.update(self.access.soap_services) 
                 self.xmlrpc_services.update(self.access.xmlrpc_services)