[haizea-commit] r847 - branches/1.1/src/haizea/core

[haizea-commit at mailman.cs.uchicago.edu]

Author: borja
Date: 2010-10-27 18:15:05 -0500 (Wed, 27 Oct 2010)
New Revision: 847

Modified:
   branches/1.1/src/haizea/core/leases.py
Log:
Fixed: Lease-to-XML did not take into account multi-instance resources.

Modified: branches/1.1/src/haizea/core/leases.py
===================================================================
--- branches/1.1/src/haizea/core/leases.py	2010-10-27 22:57:18 UTC (rev 846)
+++ branches/1.1/src/haizea/core/leases.py	2010-10-27 23:15:05 UTC (rev 847)
@@ -1785,7 +1785,11 @@
                 res.set("type", res_type)
                 ninstances = capacity.get_ninstances(res_type)
                 if ninstances == 1:
-                    res.set("amount", str(capacity.get_quantity(res_type)))                
+                    res.set("amount", str(capacity.get_quantity(res_type)))
+                else:
+                    for instance in range(1,ninstances+1):
+                        inst_elem = ET.SubElement(res, "instance")               
+                        inst_elem.set("amount", str(capacity.get_quantity_instance(res_type, instance)))
             
         return nodes