Changeset f8582c9 for fedd/fedd_allocate_project.py

Timestamp:

Nov 18, 2008 8:32:05 PM (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:

dab4d56

Parents:

fd729b9

Message:

Resource allocation and deallocation really working
Access handler selects allocation ID
Fedid allocation IDs work
Revamp of util code for maodifying messages (e.g. binaries)
Handlers now see fedids as objects in messages
Fedid bug in handlers in fedd_util

This should have been multiple commits

File:

• fedd/fedd_allocate_project.py (modified) (9 diffs)

fedd/fedd_allocate_project.py

@@ -20 +20 @@
 from fedd_internal_services import *
 from fedd_util import *
-import fixed_key
-import parse_detail
+from fixed_resource import read_key_db, read_project_db
 from service_error import *
 import logging
@@ -60 +59 @@
         fixed_key_db = config.get("access", "fixed_keys", None)
         fixed_project_db = config.get("access", "fixed_projects", None)
-        if fixed_key_db:
-            try:
-                self.fixed_keys = fixed_key.read_db(fixed_key_db)
-            except:
-                log.debug("Can't read fixed_key_db from %s" % fixed_key_db)
-        else:
-            self.fixed_keys = set()
-
-        if fixed_project_db:
-            try:
-                f = open(fixed_project_db, "r")
-                for line in f:
-                    self.fixed_projects.add(line.rstrip())
-                f.close()
-            except:
-                log.debug("Can't read fixed_project_db from %s" % \
-                        fixed_project_db)
-        else:
-            self.fixed_projects = set()
-
-
+        self.fixed_keys = set()
+        self.fixed_projects = set()
+
+        # initialize the fixed resource sets
+        for db, rset, fcn in (\
+                (fixed_key_db, self.fixed_keys, read_key_db), \
+                (fixed_project_db, self.fixed_projects, read_project_db)):
+            if db:
+                try:
+                    rset.update(fcn(db))
+                except:
+                    self.log.debug("Can't read resources from %s" % db)
+        
         # Internal services are SOAP only
         self.soap_services = {\
@@ -91 +82 @@
                 self.static_project, StaticProjectResponseMessage,\
                 "StaticProjectResponseBody"),\
-                #"ReleaseProject": make_soap_handler(\
-                #ReleaseProjectRequestMessage.typecode,\
-                #self.release_project, ReleaseProjectResponseMessage,\
-                #"ReleaseProjectResponseBody")\
+                "ReleaseProject": make_soap_handler(\
+                ReleaseProjectRequestMessage.typecode,\
+                self.release_project, ReleaseProjectResponseMessage,\
+                "ReleaseProjectResponseBody")\
                 }
         self.xmlrpc_services = { }
@@ -290 +281 @@
                     rc = subprocess.call(cmd)
                 except OSError, e:
-                    print "Static project subprocess creation error "+ \
-                                    "[%s] (%s)" %  (cmd[0], e.strerror)
                     raise service_error(service_error.internal,
                             "Static project subprocess creation error "+ \
@@ -315 +304 @@
         users = []
 
-        print "release %s" % req
         try:
             if req['ReleaseProjectRequestBody']['project'].has_key('name'):
@@ -332 +320 @@
             for sk in [ k['sshPubkey'] for k in u.get('access', []) \
                     if k.has_key('sshPubkey')]:
-                if (name, sk) not in self.fixed_keys:
+                if (name.rstrip(), sk.rstrip()) not in self.fixed_keys:
                     cmds.append((self.wap, self.addpubkey, '-R', '-w', \
                             '-u', name, '-k', sk))
-        if pname and pname not in fixed_projects:
+        if pname and pname not in self.fixed_projects:
             cmds.append((self.wap, self.rmproj, pname))
 
@@ -346 +334 @@
                     rc = subprocess.call(cmd)
                 except OSError, e:
-                    print "Release project subprocess creation error "+ \
-                                    "[%s] (%s)" %  (cmd[0], e.strerror)
                     raise service_error(service_error.internal,
                             "Release project subprocess creation error "+ \
@@ -425 +411 @@
             "StaticProjectRequestBody", StaticProjectRequestMessage,
             "StaticProjectResponseBody")
+    release_project = make_proxy("ReleaseProject",
+            "ReleaseProjectRequestBody", ReleaseProjectRequestMessage,
+            "ReleaseProjectResponseBody")
 
     def __init__(self, config):
@@ -468 +457 @@
         self.log = logging.getLogger("fedd.allocate.remote")
         set_log_level(config, "access", self.log)
-        self.release_project = None