Changeset 1b376ca for fedd/federation/allocate_project.py

Timestamp:

Dec 3, 2008 10:12:13 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:

c8853fd

Parents:

dceeef9

Message:

Correct resource communication to allocation and wildcarding of gateway requests

File:

• fedd/federation/allocate_project.py (modified) (4 diffs)

fedd/federation/allocate_project.py

@@ -176 +176 @@
                 dir="/tmp")
 
-        if req.has_key('AllocateProjectRequestBody') and \
-                req['AllocateProjectRequestBody'].has_key('project'):
-            proj = req['AllocateProjectRequestBody']['project']
+        if req.has_key('AllocateProjectRequestBody'):
+            proj = req['AllocateProjectRequestBody'].get('project', None)
+            if not proj:
+                raise service_error(service_error.req, 
+                        "Badly formed allocation request")
+            resources = req['AllocateProjectRequestBody'].get('resources', { })
         else:
             raise service_error(service_error.req, 
@@ -279 +282 @@
                 ]
 
-        # Add commands to grant access to any resources in the request.
-        for nt in [ h for r in req.get('resources', []) \
-                if r.has_key('node') and r['node'].has_key('hardware')\
-                    for h in r['node']['hardware'] ] :
-            cmds.append((self.wap, self.grantnodetype, '-p', name, nt))
+        # Add commands to grant access to any resources in the request.  The
+        # list comprehension pulls out the hardware types in the node entries
+        # in the resources list.
+        if resources.has_key('node'):
+            for nt in [ h for n in resources['node']\
+                    if n.has_key('hardware') for h in n['hardware'] ] :
+                if self.allocation_level >= self.confirm_keys:
+                    cmds.append((self.wap, self.grantnodetype, '-p', pname, nt))
+
 
         # Create the projects
@@ -344 +351 @@
             pname = req['StaticProjectRequestBody']['project']\
                     ['name']['localname']
-            resources = req['StaticProjectRequestBody'].get('resources', [])
+            resources = req['StaticProjectRequestBody'].get('resources', { })
         except KeyError:
             raise service_error(service_error.req, "Badly formed request")
@@ -370 +377 @@
         # list comprehension pulls out the hardware types in the node entries
         # in the resources list.
-        for nt in [ h for r in resources \
-                if r.has_key('node') and r['node'].has_key('hardware')\
-                    for h in r['node']['hardware'] ] :
-            if self.allocation_level >= self.confirm_keys:
-                cmds.append((self.wap, self.grantnodetype, '-p', pname, nt))
+        if resources.has_key('node'):
+            for nt in [ h for n in resources['node']\
+                    if n.has_key('hardware') for h in n['hardware'] ] :
+                if self.allocation_level >= self.confirm_keys:
+                    cmds.append((self.wap, self.grantnodetype, '-p', pname, nt))
 
         # Run the commands