X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fiotlab%2Fiotlabaggregate.py;h=fc5b2dbc8134d2bdbe6b32e458007fff99090ba4;hb=0a4f0ce95a763b227ed4b7c553804a1c072867d5;hp=6b31498b3f75eb3bc76cb7a5cccbf8441bc2bb00;hpb=66be8bb9e8f140b123ca5ddb81b965757b01d547;p=sfa.git diff --git a/sfa/iotlab/iotlabaggregate.py b/sfa/iotlab/iotlabaggregate.py index 6b31498b..fc5b2dbc 100644 --- a/sfa/iotlab/iotlabaggregate.py +++ b/sfa/iotlab/iotlabaggregate.py @@ -103,8 +103,8 @@ class IotlabAggregate: login=login) logger.debug("IotlabAggregate api \tget_slice_and_slivers \ - sfa_slice %s \r\n slices %s self.driver.hrn %s" - % (sfa_slice, slices, self.driver.hrn)) + slice_hrn %s \r\n slices %s self.driver.hrn %s" + % (slice_hrn, slices, self.driver.hrn)) if slices == []: return (sfa_slice, slivers) @@ -117,6 +117,7 @@ class IotlabAggregate: logger.log_exc("IOTLABAGGREGATE \t \ get_slice_and_slivers No nodes in the slice \ - KeyError ") + node_ids_list = [] continue for node in node_ids_list: @@ -279,13 +280,16 @@ class IotlabAggregate: return (rspec_nodes) - def get_all_leases(self): + def get_all_leases(self, ldap_username): """ Get list of lease dictionaries which all have the mandatory keys ('lease_id', 'hostname', 'site_id', 'name', 'start_time', 'duration'). All the leases running or scheduled are returned. + :param ldap_username: if ldap uid is not None, looks for the leases + belonging to this user. + :type ldap_username: string :returns: rspec lease dictionary with keys lease_id, component_id, slice_id, start_time, duration. :rtype: dict @@ -304,7 +308,10 @@ class IotlabAggregate: #lease_filter.update({'name': slice_record['name']}) #leases = self.driver.iotlab_api.GetLeases(lease_filter) - leases = self.driver.iotlab_api.GetLeases() + + logger.debug("IOTLABAGGREGATE get_all_leases ldap_username %s " + % (ldap_username)) + leases = self.driver.iotlab_api.GetLeases(login=ldap_username) grain = self.driver.iotlab_api.GetLeaseGranularity() # site_ids = [] rspec_leases = [] @@ -322,33 +329,32 @@ class IotlabAggregate: try: rspec_lease['slice_id'] = lease['slice_id'] except KeyError: - #No info on the slice used in iotlab_xp table + #No info on the slice used in testbed_xp table pass rspec_lease['start_time'] = lease['t_from'] rspec_lease['duration'] = (lease['t_until'] - lease['t_from']) \ - / grain + / grain rspec_leases.append(rspec_lease) return rspec_leases def get_rspec(self, slice_xrn=None, login=None, version=None, options=None): """ - Returns xml rspec: - - a full advertisement rspec with the testbed resources if slice_xrn - is not specified.If a lease option is given, also returns the - leases scheduled on the testbed. - - a manifest Rspec with the leases and nodes in slice's leases - if slice_xrn is not None. + - a full advertisement rspec with the testbed resources if slice_xrn is + not specified.If a lease option is given, also returns the leases + scheduled on the testbed. + - a manifest Rspec with the leases and nodes in slice's leases if + slice_xrn is not None. :param slice_xrn: srn of the slice + :type slice_xrn: string :param login: user'uid (ldap login) on iotlab + :type login: string :param version: can be set to sfa or iotlab + :type version: RSpecVersion :param options: used to specify if the leases should also be included in the returned rspec. - :type slice_xrn: string - :type login: string - :type version: RSpecVersion :type options: dict :returns: Xml Rspec. @@ -357,6 +363,7 @@ class IotlabAggregate: """ + ldap_username= None rspec = None version_manager = VersionManager() version = version_manager.get_version(version) @@ -373,6 +380,16 @@ class IotlabAggregate: version.type, version.version, 'manifest') slices, slivers = self.get_slice_and_slivers(slice_xrn, login) + if slice_xrn and slices is not None: + #Get user associated with this slice + #for one_slice in slices : + ldap_username = slices[0]['reg_researchers'][0].__dict__['hrn'] + # ldap_username = slices[0]['user'] + tmp = ldap_username.split('.') + ldap_username = tmp[1] + logger.debug("IotlabAggregate \tget_rspec **** \ + LDAP USERNAME %s \r\n" \ + % (ldap_username)) #at this point sliver may be empty if no iotlab job #is running for this user/slice. rspec = RSpec(version=rspec_version, user_options=options) @@ -403,13 +420,17 @@ class IotlabAggregate: #In case creating a job, slice_xrn is not set to None rspec.version.add_nodes(nodes) if slice_xrn and slices is not None: - #Get user associated with this slice - #for one_slice in slices : - ldap_username = slices[0]['hrn'] - tmp = ldap_username.split('.') - ldap_username = tmp[1].split('_')[0] + # #Get user associated with this slice + # #for one_slice in slices : + # ldap_username = slices[0]['reg_researchers'] + # # ldap_username = slices[0]['user'] + # tmp = ldap_username.split('.') + # ldap_username = tmp[1] + # # ldap_username = tmp[1].split('_')[0] + logger.debug("IotlabAggregate \tget_rspec **** \ - version type %s \r\n" % (version.type)) + version type %s ldap_ user %s \r\n" \ + % (version.type, ldap_username)) if version.type == "Iotlab": rspec.version.add_connection_information( ldap_username, sites_set) @@ -424,7 +445,7 @@ class IotlabAggregate: attrib, default_sliver[attrib]) if lease_option in ['all','leases']: - leases = self.get_all_leases() + leases = self.get_all_leases(ldap_username) rspec.version.add_leases(leases) logger.debug("IotlabAggregate \tget_rspec **** \ FINAL RSPEC %s \r\n" % (rspec.toxml()))