Project

General

Profile

Revision 843

Added by Borja Sotomayor over 13 years ago

- Fix call to Lease.create_new
- Use Parser instead of ISO for dates

View differences:

branches/1.1/src/haizea/core/frontends/opennebula.py
21 21 
from haizea.core.frontends import RequestFrontend
22 22 
from haizea.common.utils import UNIX2DateTime, round_datetime, get_config, OpenNebulaXMLRPCClientSingleton
23 23 
from haizea.common.opennebula_xmlrpc import OpenNebulaVM
24 
from mx.DateTime import DateTimeDelta, ISO
24 
from mx.DateTime import DateTimeDelta, Parser
25 25 

  		




  26
  26
  
    
import operator


  		




  27
  27
  
    
import logging


  		




  ......




  65
  65
  
    
            self.start = Timestamp(Timestamp.UNSPECIFIED)


  		




  66
  66
  
    
        elif self.start[0] == "+":


  		




  67
  67
  
    
            # Relative time


  		




  68
  
  
    
            self.start = Timestamp(round_datetime(self.submit_time + ISO.ParseTime(self.start[1:])))


  		




  
  68
  
    
            self.start = Timestamp(round_datetime(self.submit_time + Parser.TimeDeltaFromString(self.start[1:])))


  		




  69
  69
  
    
        else:


  		




  70
  
  
    
            self.start = Timestamp(ISO.ParseDateTime(self.start))


  		




  
  70
  
    
            self.start = Timestamp(Parser.TimeDeltaFromString(self.start))


  		




  71
  71
  
    
            


  		




  72
  72
  
    
        # Create Duration object


  		




  73
  73
  
    
        if self.duration == OpenNebulaHaizeaVM.HAIZEA_DURATION_UNLIMITED:


  		




  ......




  75
  75
  
    
            # TODO: Integrate concept of unlimited duration in the lease datastruct


  		




  76
  76
  
    
            self.duration = Duration(DateTimeDelta(36500))


  		




  77
  77
  
    
        else:


  		




  78
  
  
    
            self.duration = Duration(ISO.ParseTimeDelta(self.duration))


  		




  
  78
  
    
            self.duration = Duration(Parser.TimeDeltaFromString(self.duration))


  		




  79
  79
  
    
            


  		




  80
  80
  
    

  		




  81
  81
  
    
        self.preemptible = (self.preemptible == OpenNebulaHaizeaVM.HAIZEA_PREEMPTIBLE_YES)


  		




  ......




  162
  162
  
    
        requested_resources = dict([(i+1,vm.capacity) for i, vm in enumerate(opennebula_vms)])


  		




  163
  163
  
    

  		




  164
  164
  
    
        lease = Lease.create_new(submit_time = submit_time, 


  		




  
  165
  
    
                                 user_id = None, # TODO


  		




  165
  166
  
    
                                 requested_resources = requested_resources, 


  		




  166
  167
  
    
                                 start = start, 


  		




  167
  168
  
    
                                 duration = duration, 


  		












Also available in:  Unified diff