#from sfa.rspecs.elements.services import Services
from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.lease import Lease
+from sfa.rspecs.elements.granularity import Granularity
from sfa.rspecs.version_manager import VersionManager
#from sfa.util.sfatime import datetime_to_epoch
#filter_dict = {}
tags_filter = {}
+ # get the granularity in second for the reservation system
+ grain = self.driver.GetLeaseGranularity()
+
# Commenting this part since all nodes should be returned,
# even if a slice is provided
#if slice :
#if_count+=1
#tags = [PLTag(node_tags[tag_id]) for tag_id in node['node_tag_ids']]
+ # Granularity
+ granularity = Granularity({'grain': grain})
+ rspec_node['granularity'] = granularity
rspec_node['tags'] = []
if node['hostname'] in slivers:
# add sliver info
#if slice_record:
#lease_filter.update({'name': slice_record['name']})
return_fields = ['lease_id', 'hostname', 'site_id', \
- 'name', 't_from', 't_until']
+ 'name', 'start_time', 'duration']
#leases = self.driver.GetLeases(lease_filter)
leases = self.driver.GetLeases()
+ grain = self.driver.GetLeaseGranularity()
site_ids = []
rspec_leases = []
for lease in leases:
rspec_lease['component_id'] = hostname_to_urn(self.driver.hrn, \
site, node['hostname'])
rspec_lease['slice_id'] = lease['slice_id']
- rspec_lease['t_from'] = lease['t_from']
- rspec_lease['t_until'] = lease['t_until']
+ rspec_lease['start_time'] = lease['t_from']
+ rspec_lease['duration'] = (lease['t_until'] - lease['t_from']) / grain
rspec_leases.append(rspec_lease)
return rspec_leases
logger.debug("SlabAggregate \tget_rspec **** \
default_sliver_attribs %s \r\n" %(default_sliver_attribs))
for attrib in default_sliver_attribs:
- logger.debug("SlabAggregate \tget_rspec ******* attrib %s \r\n"\
- %(attrib))
+
rspec.version.add_default_sliver_attribute(attrib['tagname'], \
attrib['value'])
- if options.get('list_leases') :
+ if options.get('list_leases') or options.get('list_leases') and options['list_leases'] != 'resources':
leases = self.get_leases(slices)
rspec.version.add_leases(leases)
+
+ logger.debug("SlabAggregate \tget_rspec ******* rspec_toxml %s \r\n"\
+ %(rspec.toxml()))
return rspec.toxml()