Changeset 5a6b75b

Timestamp:

Dec 2, 2008 8:44:41 AM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

08329f4

Parents:

5fffd82

Message:

multiple uri aliases for the testbed

Location:

fedd/federation

Files:

• access.py (modified) (4 diffs)
• deter_impl.py (modified) (1 diff)

fedd/federation/access.py

@@ -38 +38 @@
     bool_attrs = ("project_priority", "allow_proxy")
     emulab_attrs = ("boss", "ops", "domain", "fileserver", "eventserver")
-    id_attrs = ("testbed", "proxy",
+    id_attrs = ("proxy",
             "proxy_cert_file", "proxy_cert_pwd", "proxy_trusted_certs",
             "project_allocation_uri", "project_allocation_cert_file", 
@@ -96 +96 @@
             auth = authorizer()
 
-        self.fedid_default = "testbed"
+        tb = config.get('access', 'testbed')
+        if tb: self.testbed = [ t.strip() for t in tb.split(',') ]
+        else: self.testbed = [ ]
+
         if config.has_option("access", "accessdb"):
             self.read_access(config.get("access", "accessdb"))
@@ -544 +547 @@
             dt = unpack_id(req['destinationTestbed'])
 
-        if dt == None or dt == self.testbed:
+        if dt == None or dt in self.testbed:
             # Request for this fedd
             found, dyn, owners = self.lookup_access(req, fid)
@@ -701 +704 @@
             dt = None
 
-        if dt == None or dt == self.testbed:
+        if dt == None or dt in self.testbed:
             # Local request
             try:

fedd/federation/deter_impl.py

@@ -53 +53 @@
                         experiment_control_local(config, self.auth)
                 # Tell the experiment control where local access control is and
-                # what testbed it pertains to.
+                # what testbeds it pertains to.
                 if self.access:
-                    self.experiment.local_access[self.access.testbed] = \
-                            self.access
+                    for t in self.access.testbed:
+                        self.experiment.local_access[t] = self.access
 
                 self.soap_services.update(self.experiment.soap_services)