#from plc/aggregate.py
- def get_rspec(self, slice_xrn=None, login=None, version = None, options
- =None):
+ def get_rspec(self, slice_xrn=None, login=None, version = None, \
+ options=None):
rspec = None
version_manager = VersionManager()
#if slice and 'expires' in slice:
- #rspec.xml.set('expires', datetime_to_epoch(slice['expires']))
+ #rspec.xml.set('expires',\
+ #datetime_to_string(utcparse(slice['expires']))
# add sliver defaults
#nodes, links = self.get_nodes(slice, slivers)
logger.debug("\r\n \r\n SlabAggregate \tget_rspec *** \
slice_xrn %s slices %s\r\n \r\n"\
%(slice_xrn, slices))
- try:
+ if options is not None:
lease_option = options['list_leases']
- except KeyError:
+ else:
#If no options are specified, at least print the resources
lease_option = 'all'
#if slice_xrn :
#lease_option = 'all'
- pass
+
if lease_option in ['all', 'resources']:
#if not options.get('list_leases') or options.get('list_leases')
return
+ @staticmethod
+ def GetMinExperimentDurationInSec():
+ return 600
@staticmethod
def GetPeers (peer_filter=None ):
#Now we have the slice record fixed_slicerec_dict, get the
#jobs associated to this slice
- leases_list = self.GetLeases(login = login)
+ leases_list = []
+ if login is not None:
+ leases_list = self.GetLeases(login = login)
#If no job is running or no job scheduled
#return only the slice record
if leases_list == [] and fixed_slicerec_dict:
#the lease to the requested leases list
duration_in_seconds = \
int(single_requested_lease['duration'])*60
- if duration_in_seconds > self.slab_api.GetLeaseGranularity():
+ if duration_in_seconds > GetMinExperimentDurationInSec() :
requested_lease_list.append(single_requested_lease)
- return requested_lease_list
+ return requested_lease_list
@staticmethod
def _group_leases_by_start_time(requested_lease_list):
if lease['start_time'] not in requested_job_dict:
if isinstance(lease['hostname'], str):
- #lease['hostname'] = [lease['hostname']]
- lease['hostname'] = list(lease['hostname'])
+ lease['hostname'] = [lease['hostname']]
+
requested_job_dict[lease['start_time']] = lease