Changeset c3dcf48 for fedd/federation/access.py

Timestamp:

Dec 4, 2008 9:49:39 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:

416292f

Parents:

2ac63f7d

Message:

Snapshot of new state-based allocation

File:

• fedd/federation/access.py (modified) (8 diffs)

fedd/federation/access.py

@@ -80 +80 @@
         self.projects = { }
         self.keys = { }
+        self.types = { }
         self.allocation = { }
         self.state = { 
             'projects': self.projects,
             'allocation' : self.allocation,
-            'keys' : self.keys
+            'keys' : self.keys,
+            'types': self.types
         }
         self.log = logging.getLogger("fedd.access")
@@ -331 +333 @@
                 self.projects = self.state['projects']
                 self.keys = self.state['keys']
+                self.types = self.state['types']
 
                 self.log.debug("[read_state]: Read state from %s" % \
@@ -653 +656 @@
             self.state_lock.acquire()
             self.allocation[aid] = { }
+            try:
+                pname = ap['project']['name']['localname']
+            except KeyError:
+                pname = None
+
             if dyn[1]:
-                try:
-                    pname = ap['project']['name']['localname']
-                except KeyError:
+                if not pname:
                     self.state_lock.release()
                     raise service_error(service_error.internal,
@@ -663 +669 @@
                 else: self.projects[pname] = 1
                 self.allocation[aid]['project'] = pname
+
+            if ap.has_key('resources'):
+                if not pname:
+                    self.state_lock.release()
+                    raise service_error(service_error.internal,
+                            "Misformed allocation response?")
+                self.allocation[aid]['types'] = set()
+                nodes = ap['resources'].get('node', [])
+                for n in nodes:
+                    for h in n.get('hardware', []):
+                        if self.types.has_key((pname, h)):
+                            self.types[(pname, h)] += 1
+                        else:
+                            self.types[(pname, h)] = 1
+                        self.allocation[aid]['types'].add((pname,h))
+
 
             self.allocation[aid]['keys'] = [ ]
@@ -680 +702 @@
                         "Misformed allocation response?")
 
+
             self.allocation[aid]['owners'] = owners
             self.write_state()
@@ -741 +764 @@
             del_users = { }
             del_project = None
+            del_types = set()
+
             if self.allocation.has_key(aid):
                 self.log.debug("Found allocation for %s" %aid)
@@ -759 +784 @@
                         del_project = pname
                         del self.projects[pname]
+
+                if self.allocation[aid].has_key('types'):
+                    for t in self.allocation[aid]['types']:
+                        self.types[t] -= 1
+                        if self.types[t] == 0:
+                            if not del_project: del_project = t[0]
+                            del_types.add(t[1])
+                            del self.types[t]
 
                 del self.allocation[aid]
@@ -776 +809 @@
                     if users: 
                         msg['project']['user'] = users
+                    if len(del_types) > 0:
+                        msg['resources'] = { 'node': \
+                                [ {'hardware': [ h ] } for h in del_types ]\
+                            }
                     if self.allocate_project.release_project:
                         msg = { 'ReleaseProjectRequestBody' : msg}