Changeset ec4fb42 for fedd/fedd/allocate_project.py

Timestamp:

Nov 30, 2008 9:19:33 AM (15 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:

7454054

Parents:

f0dc2ca

Message:

Clean up some names that start with fedd_ that are ugly with the new package
structure. A couple other bugs cleaned up, too.

File:

• fedd/fedd/allocate_project.py (moved) (moved from fedd/fedd/fedd_allocate_project.py) (6 diffs)

fedd/fedd/allocate_project.py

@@ -10 +10 @@
 from fedd_services import *
 from fedd_internal_services import *
-from fedd_util import *
+from util import *
 from fedid import fedid
 from fixed_resource import read_key_db, read_project_db
 from remote_service import xmlrpc_handler, soap_handler, service_caller
-from service_error import *
+from service_error import service_error
 import logging
 
@@ -29 +29 @@
 
 
-class fedd_allocate_project_local:
+class allocate_project_local:
     """
     Allocate projects on this machine in response to an access request.
@@ -168 +168 @@
                         uid.get('uri', None)
                 if uname == None:
-                    raise fedd_proj.service_error(fedd_proj.service_error.req, 
-                            "No ID for user");
+                    raise service_error(service_error.req, "No ID for user");
 
             access = user.get('access', None)
@@ -175 +174 @@
                 ssh = access[0].get('sshPubkey', None)
                 if ssh == None:
-                    raise fedd_proj.service_error(fedd_proj.service_error.req, 
+                    raise service_error(service_error.req, 
                             "No ssh key for user");
         else:
-            raise fedd_proj.service_error(fedd_proj.service_error.req, 
+            raise service_error(service_error.req, 
                     "No access information for project");
 
@@ -378 +377 @@
         return { 'project': req['ReleaseProjectRequestBody']['project']}
 
-class fedd_allocate_project_remote:
+class allocate_project_remote:
     """
     Allocate projects on a remote machine using the internal SOAP interface
@@ -426 +425 @@
                         "Bad proxy response")
 
-    # back to defining the fedd_allocate_project_remote class
+    # back to defining the allocate_project_remote class
     def __init__(self, config, auth=None):
         """