Changeset 3c6dbec


Ignore:
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:
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • fedd/federation/deter_impl.py

    r11860f52 r3c6dbec  
    11#!/usr/local/bin/python
    22
    3 from access import access
     3import emulab_access
    44from experiment_control import experiment_control_local
    55from split import split_local
     
    3232            self.cert_pwd = config.get("globals", "cert_pwd");
    3333            self.trusted_certs = config.get("globals", "trusted_certs");
     34            self.access_type = config.get("globals", "access_type", "emulab")
    3435
    3536            access_db = config.get("globals", "accessdb")
     
    4546
    4647            if config.has_section("access"):
    47                 self.access = access(config, self.auth)
     48                if self.access_type == "emulab":
     49                    self.access = emulab_access.access(config, self.auth)
     50                else:
     51                    raise RuntimeError("Unknown access_type: %s" % \
     52                            self.access_type)
    4853                self.soap_services.update(self.access.soap_services)
    4954                self.xmlrpc_services.update(self.access.xmlrpc_services)
Note: See TracChangeset for help on using the changeset viewer.