if options is None: options={}
filter={}
if slice:
- filter.update({'name':slice['slice_name']})
+ filter.update({'slice_hrn':slice['slice_hrn']}) # JORDAN: this is = "upmc" !!!
+ #filter.update({'name':slice['slice_name']})
#return_fields = ['lease_id', 'hostname', 'site_id', 'name', 't_from', 't_until']
leases = self.driver.GetLeases(lease_filter_dict=filter)
grain = self.driver.testbed_shell.GetLeaseGranularity()
.. seealso:: http://groups.geni.net/geni/wiki/GAPI_AM_API_V3/CommonConcepts#urns
"""
-
+ # JORDAN using SLICE_KEY for slice_hrn
+ SLICE_KEY = 'slice_hrn' # slice_hrn
if options is None: options={}
slice_ids = set()
node_ids = []
\r\n" % (xrn, slice_names))
filter_sliver = {}
if slice_names:
- filter_sliver['slice_hrn'] = list(slice_names)
- slice_hrn = filter_sliver['slice_hrn'][0]
+ filter_sliver[SLICE_KEY] = list(slice_names)
+ slice_hrn = filter_sliver[SLICE_KEY][0]
- slice_filter_type = 'slice_hrn'
+ slice_filter_type = SLICE_KEY
# if slice_ids:
# filter['slice_id'] = list(slice_ids)
# # get slices
if slice_hrn:
+ #logger.debug("JORDAN SLICE_HRN=%r" % slice_hrn)
slices = self.driver.GetSlices(slice_hrn,
slice_filter_type)
- leases = self.driver.GetLeases({'slice_hrn':slice_hrn})
+ leases = self.driver.GetLeases({SLICE_KEY:slice_hrn})
logger.debug("IotlabAggregate \t get_slivers \
slices %s leases %s\r\n" % (slices, leases ))
if not slices:
single_slice = slices[0]
# get sliver users
+ # XXX LOIC !!! XXX QUICK AND DIRTY - Let's try...
+ logger.debug("LOIC Number of reg_researchers = %s" % len(single_slice['reg_researchers']))
+ if 'reg_researchers' in single_slice and len(single_slice['reg_researchers'])==0:
+ user = {'uid':single_slice['user']}
+ else:
+ user = single_slice['reg_researchers'][0].__dict__
+
user = single_slice['reg_researchers'][0].__dict__
logger.debug("IotlabAggregate \t get_slivers user %s \
\r\n" % (user))
\r\n" % (person))
# name = person['last_name']
user['login'] = person['uid']
- user['user_urn'] = hrn_to_urn(user['hrn'], 'user')
- user['keys'] = person['pkey']
+ # XXX LOIC !!! if we have more info, let's fill user
+ if 'hrn' in user:
+ user['user_urn'] = hrn_to_urn(user['hrn'], 'user')
+ if 'keys' in user:
+ user['keys'] = person['pkey']
try:
node_ids = single_slice['node_ids']
- node_list = self.driver.testbed_shell.GetNodes(
- {'hostname':single_slice['node_ids']})
+ node_list = self.driver.testbed_shell.GetNodes()
+# JORDAN REMOVED FILTER so that next check always succeed
+# {'hostname':single_slice['node_ids']})
node_by_hostname = dict([(node['hostname'], node)
for node in node_list])
except KeyError:
node_id = current_lease['resource_ids'][index]
# node['slice_name'] = user['login']
# node.update(single_slice)
+ # JORDAN XXX This fails sometimes when hostname not in the list
+ #if hostname in node_by_hostname:
more_info = node_by_hostname[hostname]
node.update(more_info)
+ #else:
+ # # This can happen when specifying a lease without the resource, then all subsequent calls will fail
+ # logger.debug("Ignored missing hostname for now one")
# oar_job_id is the slice_id (lease_id)
sliver_hrn = '%s.%s-%s' % (self.driver.hrn,
- current_lease['lease_id'], node_id)
+ current_lease['lease_id'], node_id)
node['node_id'] = node_id
node['expires'] = current_lease['t_until']
node['sliver_id'] = Xrn(sliver_hrn, type='sliver').urn
geni_urn = sliver_allocation.slice_urn
sliver_allocation_dict[sliver_allocation.sliver_id] = \
sliver_allocation
- if not options.get('list_leases') or options['list_leases'] != 'leases':
+ # JORDAN get the option list_leases if we want to have the leases in describe
+ show_leases = options.get('list_leases')
+ if show_leases in ['resources', 'all']:
+ #if not options.get('list_leases') or options['list_leases'] != 'leases':
# add slivers
nodes_dict = {}
for sliver in slivers:
geni_slivers.append(geni_sliver)
rspec.version.add_nodes(rspec_nodes)
- if not options.get('list_leases') or options['list_leases'] == 'resources':
+ if show_leases in ['leases', 'all']:
+ #if not options.get('list_leases') or options['list_leases'] == 'resources':
if slivers:
- leases = self.get_leases(slivers[0])
+ leases = self.get_leases(slice=slivers[0])
+ logger.debug("JORDAN: getting leases from slice: %r" % slivers[0])
rspec.version.add_leases(leases)
return {'geni_urn': geni_urn,