Changeset 1b376ca for fedd/federation/access.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/access.py (modified) (4 diffs)

fedd/federation/access.py

@@ -541 +541 @@
         """
 
+        def gateway_hardware(h):
+            if h == 'GWTYPE': return self.attrs.get('connectorType', 'GWTYPE')
+            else: return h
+
         # The dance to get into the request body
         if req.has_key('RequestAccessRequestBody'):
@@ -567 +571 @@
             if req.has_key('resources') and req['resources'].has_key('node'):
                 resources = req['resources']
-                restricted = [ t for n in resources['node'] \
+                restricted = [ gateway_hardware(t) for n in resources['node'] \
                                 if n.has_key('hardware') \
                                     for t in n['hardware'] \
-                                        if t in self.restricted ]
+                                        if gateway_hardware(t) \
+                                            in self.restricted ]
                 inaccessible = [ t for t in restricted \
                                     if t not in found[0].node_types]
@@ -611 +616 @@
                     if restricted != None and len(restricted) > 0:
                         preq['AllocateProjectRequestBody']['resources'] = \
-                            [ {'node': { 'hardware' :  [ h ] } } \
-                                    for h in restricted ]
+                             {'node': [ { 'hardware' :  [ h ] } \
+                                    for h in restricted ] } 
                     ap = self.allocate_project.dynamic_project(preq)
                 else:
@@ -636 +641 @@
                     if restricted != None and len(restricted) > 0:
                         preq['StaticProjectRequestBody']['resources'] = \
-                            [ {'node': { 'hardware' :  [ h ] } } \
-                                    for h in restricted ]
+                            {'node': [ { 'hardware' :  [ h ] } \
+                                    for h in restricted ] } 
                     ap = self.allocate_project.static_project(preq)
             else: