Task #8887: check claim status before setting task to scheduled/conflict

SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py

@@ -148,12 +148,16 @@ class ResourceAssigner():
         main_needed = needed[str(otdb_id)]
         if self.checkResources(main_needed, available):
             task = self.radbrpc.getTask(taskId)
-            claimed, resourceIds = self.claimResources(main_needed, task)
+            claimed, claim_ids = self.claimResources(main_needed, task)
             if claimed:
                 self.radbrpc.updateTaskAndResourceClaims(taskId, claim_status='allocated')
+                claims = self.radbrpc.getResourceClaims(task_id=taskId)
+                if len(claim_ids) == len([x for x in claims if x['status'] == 'allocated'):
                     self.radbrpc.updateTask(taskId, status='scheduled')
                 else:
                     self.radbrpc.updateTask(taskId, status='conflict')
+            else:
+                self.radbrpc.updateTask(taskId, status='conflict')
 
         self.processPredecessors(specification_tree)