Changeset a398ec9

Timestamp:

Nov 23, 2008 5:14:31 PM (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:

c35207d

Parents:

1653a08

Message:

remove option conflict

Location:

fedd

Files:

• fedd_access.py (modified) (2 diffs)
• fedd_client.py (modified) (1 diff)

fedd/fedd_access.py

@@ -38 +38 @@
     class parse_error(RuntimeError): pass
 
-    bool_attrs = ("dynamic_projects", "project_priority")
+    bool_attrs = ("dynamic_projects", "project_priority", "allow_proxy")
     emulab_attrs = ("boss", "ops", "domain", "fileserver", "eventserver")
     id_attrs = ("testbed", "proxy",
@@ -686 +686 @@
             return resp
         else:
-            resp = self.proxy_RequestAccess.call_service(dt, req,
-                        self.proxy_cert_file, self.proxy_cert_pwd,
-                        self.proxy_trusted_certs)
-            if resp.has_key('RequestAccessResponseBody'):
-                return resp['RequestAccessResponseBody']
-            else:
-                return None
+            if self.allow_proxy:
+                resp = self.proxy_RequestAccess.call_service(dt, req,
+                            self.proxy_cert_file, self.proxy_cert_pwd,
+                            self.proxy_trusted_certs)
+                if resp.has_key('RequestAccessResponseBody'):
+                    return resp['RequestAccessResponseBody']
+                else:
+                    return None
+            else:
+                raise service_error(service_error.access,
+                        "Access proxying denied")
 
     def ReleaseAccess(self, req, fid):

fedd/fedd_client.py

@@ -151 +151 @@
                     callback=add_node_callback, callback_args=(node_descs,),
                     help="Node description: image:hardware[:count]")
-        self.add_option("-p", "--project", action="store", dest="project", 
-                type="string",
-                help="Use a project request with this project name")
         self.add_option("-t", "--testbed", action="store", dest="testbed",
                 type="string",