[haizea-commit] r434 - in trunk/src/haizea/resourcemanager: enact/opennebula frontends

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

Author: borja
Date: 2008-07-11 10:50:40 -0500 (Fri, 11 Jul 2008)
New Revision: 434

Modified:
   trunk/src/haizea/resourcemanager/enact/opennebula/vm.py
   trunk/src/haizea/resourcemanager/frontends/opennebula.py
Log:
Fixed minor bugs in OpenNebula code

Modified: trunk/src/haizea/resourcemanager/enact/opennebula/vm.py
===================================================================
--- trunk/src/haizea/resourcemanager/enact/opennebula/vm.py	2008-07-11 14:04:54 UTC (rev 433)
+++ trunk/src/haizea/resourcemanager/enact/opennebula/vm.py	2008-07-11 15:50:40 UTC (rev 434)
@@ -101,7 +101,7 @@
             if state == 5:
                 self.logger.debug("Suspend of L%iV%i correct." % (action.lease_haizea_id, vnode), constants.ONE)
             else:
-                self.logger.warning("ONE did not complete suspend  of L%i%V%i on time. State is %i" % (action.leaseHaizeaID, vnode, state), constants.ONE)
+                self.logger.warning("ONE did not complete suspend  of L%iV%i on time. State is %i" % (action.lease_haizea_id, vnode, state), constants.ONE)
                 result = 1
         return result
         
@@ -118,7 +118,7 @@
             if state == 3:
                 self.logger.debug("Resume of L%iV%i correct." % (action.lease_haizea_id, vnode), constants.ONE)
             else:
-                self.logger.warning("ONE did not complete resume of L%i%V%i on time. State is %i" % (action.leaseHaizeaID, vnode, state), constants.ONE)
+                self.logger.warning("ONE did not complete resume of L%iV%i on time. State is %i" % (action.lease_haizea_id, vnode, state), constants.ONE)
                 result = 1
         return result
 

Modified: trunk/src/haizea/resourcemanager/frontends/opennebula.py
===================================================================
--- trunk/src/haizea/resourcemanager/frontends/opennebula.py	2008-07-11 14:04:54 UTC (rev 433)
+++ trunk/src/haizea/resourcemanager/frontends/opennebula.py	2008-07-11 15:50:40 UTC (rev 434)
@@ -96,7 +96,7 @@
         numnodes = 1
         resreq = ResourceTuple.create_empty()
         resreq.set_by_type(constants.RES_CPU, float(attrs[ONE_CPU]))
-        resreq.set_by_type(constants.RES_MEM, int(attrs[ONE_MEMORY])/1000)
+        resreq.set_by_type(constants.RES_MEM, int(attrs[ONE_MEMORY]))
 
         duration = haizea_param[HAIZEA_DURATION]
         if duration == HAIZEA_DURATION_UNLIMITED: