[haizea-commit] r843 - branches/1.1/src/haizea/core/frontends

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

Author: borja
Date: 2010-10-20 14:45:59 -0500 (Wed, 20 Oct 2010)
New Revision: 843

Modified:
   branches/1.1/src/haizea/core/frontends/opennebula.py
Log:
- Fix call to Lease.create_new
- Use Parser instead of ISO for dates

Modified: branches/1.1/src/haizea/core/frontends/opennebula.py
===================================================================
--- branches/1.1/src/haizea/core/frontends/opennebula.py	2010-10-20 19:43:42 UTC (rev 842)
+++ branches/1.1/src/haizea/core/frontends/opennebula.py	2010-10-20 19:45:59 UTC (rev 843)
@@ -21,7 +21,7 @@
 from haizea.core.frontends import RequestFrontend
 from haizea.common.utils import UNIX2DateTime, round_datetime, get_config, OpenNebulaXMLRPCClientSingleton
 from haizea.common.opennebula_xmlrpc import OpenNebulaVM
-from mx.DateTime import DateTimeDelta, ISO
+from mx.DateTime import DateTimeDelta, Parser
 
 import operator
 import logging
@@ -65,9 +65,9 @@
             self.start = Timestamp(Timestamp.UNSPECIFIED)
         elif self.start[0] == "+":
             # Relative time
-            self.start = Timestamp(round_datetime(self.submit_time + ISO.ParseTime(self.start[1:])))
+            self.start = Timestamp(round_datetime(self.submit_time + Parser.TimeDeltaFromString(self.start[1:])))
         else:
-            self.start = Timestamp(ISO.ParseDateTime(self.start))
+            self.start = Timestamp(Parser.TimeDeltaFromString(self.start))
             
         # Create Duration object
         if self.duration == OpenNebulaHaizeaVM.HAIZEA_DURATION_UNLIMITED:
@@ -75,7 +75,7 @@
             # TODO: Integrate concept of unlimited duration in the lease datastruct
             self.duration = Duration(DateTimeDelta(36500))
         else:
-            self.duration = Duration(ISO.ParseTimeDelta(self.duration))
+            self.duration = Duration(Parser.TimeDeltaFromString(self.duration))
             
 
         self.preemptible = (self.preemptible == OpenNebulaHaizeaVM.HAIZEA_PREEMPTIBLE_YES)
@@ -162,6 +162,7 @@
         requested_resources = dict([(i+1,vm.capacity) for i, vm in enumerate(opennebula_vms)])
 
         lease = Lease.create_new(submit_time = submit_time, 
+                                 user_id = None, # TODO
                                  requested_resources = requested_resources, 
                                  start = start, 
                                  duration = duration,