X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fsenslab%2Fslabaggregate.py;h=337f88898a4e3313ae29afe22bdf070ae9a9eb09;hb=da2fe4312309e507c295409557f41ab9d4a86d37;hp=6889985e5434cb3564ff2779eb557ffe02e992b2;hpb=58bb8560ad3cd922587621565543440f68ffbfe2;p=sfa.git diff --git a/sfa/senslab/slabaggregate.py b/sfa/senslab/slabaggregate.py index 6889985e..337f8889 100644 --- a/sfa/senslab/slabaggregate.py +++ b/sfa/senslab/slabaggregate.py @@ -1,41 +1,35 @@ - -#!/usr/bin/python - -# import modules used here -- sys is a very standard one -import sys -import httplib -import json - - -from sfa.rspecs.version_manager import VersionManager -from sfa.senslab.OARrestapi import * -#from sfa.senslab.slabdriver import SlabDriver -from sfa.util.config import Config -from sfa.util.xrn import hrn_to_urn, urn_to_hrn, urn_to_sliver_id -from sfa.util.plxrn import PlXrn, hostname_to_urn, hrn_to_pl_slicename +import time +from sfa.util.xrn import hrn_to_urn, urn_to_hrn from sfa.rspecs.rspec import RSpec +from sfa.rspecs.elements.versions.slabv1Node import SlabPosition from sfa.rspecs.elements.location import Location from sfa.rspecs.elements.hardware_type import HardwareType -from sfa.rspecs.elements.node import Node -#from sfa.rspecs.elements.link import Link +from sfa.rspecs.elements.login import Login +from sfa.rspecs.elements.services import Services from sfa.rspecs.elements.sliver import Sliver -#from sfa.rspecs.elements.login import Login -#from sfa.rspecs.elements.location import Location -#from sfa.rspecs.elements.interface import Interface -#from sfa.rspecs.elements.services import Services -#from sfa.rspecs.elements.pltag import PLTag - +from sfa.rspecs.elements.lease import Lease +from sfa.rspecs.elements.granularity import Granularity from sfa.rspecs.version_manager import VersionManager -#from sfa.plc.vlink import get_tc_rate -from sfa.util.sfatime import datetime_to_epoch -def hostname_to_hrn(root_auth,login_base,hostname): - return PlXrn(auth=root_auth,hostname=login_base+'_'+hostname).get_hrn() -class SlabAggregate: +from sfa.rspecs.elements.versions.slabv1Node import SlabNode +from sfa.util.sfalogging import logger + +from sfa.util.xrn import Xrn + +def slab_xrn_to_hostname(xrn): + return Xrn.unescape(Xrn(xrn=xrn, type='node').get_leaf()) +def slab_xrn_object(root_auth, hostname): + """Attributes are urn and hrn. + Get the hostname using slab_xrn_to_hostname on the urn. + """ + return Xrn('.'.join( [root_auth, Xrn.escape(hostname)]), type='node') + +class SlabAggregate: + sites = {} nodes = {} api = None @@ -43,228 +37,346 @@ class SlabAggregate: links = {} node_tags = {} - prepared=False + prepared = False user_options = {} - def __init__(self ,driver): - #self.OARImporter = OARapi() + def __init__(self, driver): self.driver = driver - #self.api = api - print >>sys.stderr,"\r\n \r\n \t\t_____________INIT Slabaggregate api : %s" %(driver) - def get_slice_and_slivers(self, slice_xrn): """ Returns a dict of slivers keyed on the sliver's node_id """ slivers = {} - slice = None + sfa_slice = None if not slice_xrn: - return (slice, slivers) + return (sfa_slice, slivers) slice_urn = hrn_to_urn(slice_xrn, 'slice') slice_hrn, _ = urn_to_hrn(slice_xrn) slice_name = slice_hrn - print >>sys.stderr,"\r\n \r\n \t\t_____________ Slabaggregate api get_slice_and_slivers " - slices = self.driver.GetSlices({'slice_hrn':str(slice_name)}) - print >>sys.stderr,"\r\n \r\n \t\t_____________ Slabaggregate api get_slice_and_slivers slices %s " %(slices) + + slices = self.driver.GetSlices(slice_filter= str(slice_name), \ + slice_filter_type = 'slice_hrn') + logger.debug("Slabaggregate api \tget_slice_and_slivers \ + slices %s self.driver.hrn %s" \ + %(slices, self.driver.hrn)) if not slices: - return (slice, slivers) - slice = slices[0] + return (sfa_slice, slivers) + #if isinstance(sfa_slice, list): + #sfa_slice = slices[0] + #else: + #sfa_slice = slices # sort slivers by node id , if there is a job #and therfore, node allocated to this slice - if slice['oar_job_id'] is not -1: + for sfa_slice in slices: try: - - for node_id in slice['node_ids']: - #node_id = self.driver.root_auth + '.' + node_id - sliver = Sliver({'sliver_id': urn_to_sliver_id(slice_urn, slice['record_id_slice'], node_id), - 'name': slice['slice_hrn'], - 'type': 'slab-vm', - 'tags': []}) - slivers[node_id]= sliver + node_ids_list = sfa_slice['node_ids'] except KeyError: - print>>sys.stderr, " \r\n \t\t get_slice_and_slivers KeyError " - ## sort sliver attributes by node id - ##tags = self.driver.GetSliceTags({'slice_tag_id': slice['slice_tag_ids']}) - ##for tag in tags: - ### most likely a default/global sliver attribute (node_id == None) - ##if tag['node_id'] not in slivers: - ##sliver = Sliver({'sliver_id': urn_to_sliver_id(slice_urn, slice['slice_id'], ""), - ##'name': 'slab-vm', - ##'tags': []}) - ##slivers[tag['node_id']] = sliver - ##slivers[tag['node_id']]['tags'].append(tag) - print >>sys.stderr,"\r\n \r\n \t\t_____________ Slabaggregate api get_slice_and_slivers slivers %s " %(slivers) - return (slice, slivers) - - - - def get_nodes(self,slice=None,slivers=[], options={}): - filtre = {} - - nodes = self.driver.GetNodes(filtre) - - - interface_ids = [] - tag_ids = [] - nodes_dict = {} - for node in nodes: - nodes_dict[node['node_id']] = node - - rspec_nodes = [] - for node in nodes: + logger.log_exc("SLABAGGREGATE \t \ + get_slice_and_slivers KeyError ") + continue + + for node in node_ids_list: + sliver_xrn = Xrn(slice_urn, type='sliver', id=node) + sliver_xrn.set_authority(self.driver.hrn) + #node_id = self.driver.root_auth + '.' + node_id + sliver = Sliver({'sliver_id':sliver_xrn.urn, + 'name': sfa_slice['slice_hrn'], + 'type': 'slab-node', + 'tags': []}) + + slivers[node] = sliver - node['hostname'] = hostname_to_hrn( self.driver.root_auth,node['site_login_base'], node['hostname']) - rspec_node = Node() - - rspec_node['component_id'] = hostname_to_urn(self.driver.root_auth, node['site_login_base'], node['hostname']) - rspec_node['component_name'] = node['hostname'] - rspec_node['component_manager_id'] = hrn_to_urn(self.driver.root_auth, 'authority+sa') - rspec_node['authority_id'] = hrn_to_urn(PlXrn.site_hrn(self.driver.root_auth, node['site_login_base']), 'authority+sa') - rspec_node['boot_state'] = node['boot_state'] - if node['posx'] and node['posy']: - location = Location({'longitude':node['posx'], 'latitude': node['posy']}) - rspec_node['location'] = location - - rspec_node['exclusive'] = 'True' - rspec_node['hardware_types']= [HardwareType({'name': 'senslab sensor node'})] + + #Add default sliver attribute : + #connection information for senslab + tmp = sfa_slice['slice_hrn'].split('.') + ldap_username = tmp[1].split('_')[0] + vmaddr = 'ssh ' + ldap_username + '@grenoble.senslab.info' + slivers['default_sliver'] = {'vm': vmaddr , 'login': ldap_username} - rspec_node['interfaces'] = [] - + logger.debug("SLABAGGREGATE api get_slice_and_slivers slivers %s "\ + %(slivers)) + return (slices, slivers) + - rspec_node['tags'] = [] - - rspec_nodes.append(rspec_node) - return (rspec_nodes) - def get_nodes_and_links(self, slice=None,slivers=[], options={}): - filter = {} - tags_filter = {} - if slice and 'node_ids' in slice and slice['node_ids']: - filter['hostname'] = slice['node_ids'] - tags_filter=filter.copy() - nodes = self.driver.GetNodes(filter['hostname']) - else : - nodes = self.driver.GetNodes() + def get_nodes(self, slices=None, slivers=[], options={}): + # NT: the semantic of this function is not clear to me : + # if slice is not defined, then all the nodes should be returned + # if slice is defined, we should return only the nodes that + # are part of this slice + # but what is the role of the slivers parameter ? + # So i assume that slice['node_ids'] will be the same as slivers for us + #filter_dict = {} + #if slice_xrn: + #if not slices or not slices['node_ids']: + #return ([],[]) + #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 'node_ids' in slice and slice['node_ids']: + # #first case, a non empty slice was provided + # filter['hostname'] = slice['node_ids'] + # tags_filter=filter.copy() + # nodes = self.driver.GetNodes(filter['hostname']) + # else : + # #second case, a slice was provided, but is empty + # nodes={} + #else : + # #third case, no slice was provided + # nodes = self.driver.GetNodes() + nodes = self.driver.GetNodes() #geni_available = options.get('geni_available') #if geni_available: #filter['boot_state'] = 'boot' - print>>sys.stderr, "\r\n \r\n \t get_nodes_and_links filter %s \r\n \r\n \t slivers %s" %(filter, slivers) + #filter.update({'peer_id': None}) #nodes = self.driver.GetNodes(filter['hostname']) - print>>sys.stderr, "\r\n \r\n \t get_nodes_and_links nodes %s" %(nodes) #site_ids = [] #interface_ids = [] #tag_ids = [] nodes_dict = {} for node in nodes: - #site_ids.append(node['site_id']) - #interface_ids.extend(node['interface_ids']) - #tag_ids.extend(node['node_tag_ids']) + nodes_dict[node['node_id']] = node - + #logger.debug("SLABAGGREGATE api get_nodes nodes %s "\ + #%(nodes )) # get sites #sites_dict = self.get_sites({'site_id': site_ids}) # get interfaces #interfaces = self.get_interfaces({'interface_id':interface_ids}) # get tags #node_tags = self.get_node_tags(tags_filter) - - #links = self.get_links(sites_dict, nodes_dict, interfaces) + #if slices, this means we got to list all the nodes given to this slice + # Make a list of all the nodes in the slice before getting their attributes rspec_nodes = [] + slice_nodes_list = [] + logger.debug("SLABAGGREGATE api get_nodes slice_nodes_list %s "\ + %(slices )) + if slices: + for one_slice in slices: + try: + slice_nodes_list = one_slice['node_ids'] + except KeyError: + pass + #for node in one_slice['node_ids']: + #slice_nodes_list.append(node) + + reserved_nodes = self.driver.GetNodesCurrentlyInUse() + logger.debug("SLABAGGREGATE api get_nodes slice_nodes_list %s "\ + %(slice_nodes_list)) for node in nodes: # skip whitelisted nodes #if node['slice_ids_whitelist']: #if not slice or slice['slice_id'] not in node['slice_ids_whitelist']: #continue - rspec_node = Node() - # xxx how to retrieve site['login_base'] - #site_id=node['site_id'] - #site=sites_dict[site_id] - rspec_node['component_id'] = hostname_to_urn(self.driver.root_auth, node['site_login_base'], node['hostname']) - rspec_node['component_name'] = node['hostname'] - rspec_node['component_manager_id'] = hrn_to_urn(self.driver.root_auth, 'authority+sa') - #rspec_node['component_manager_id'] = Xrn(self.driver.root_auth, 'authority+sa').get_urn() - rspec_node['authority_id'] = hrn_to_urn(PlXrn.site_hrn(self.driver.root_auth, node['site_login_base']), 'authority+sa') - # do not include boot state ( element) in the manifest rspec - if not slice: + #rspec_node = Node() + #logger.debug("SLABAGGREGATE api get_nodes node %s "\ + #%(node)) + if slice_nodes_list == [] or node['hostname'] in slice_nodes_list: + + rspec_node = SlabNode() + # xxx how to retrieve site['login_base'] + #site_id=node['site_id'] + #site=sites_dict[site_id] + rspec_node['mobile'] = node['mobile'] + rspec_node['archi'] = node['archi'] + rspec_node['radio'] = node['radio'] + + slab_xrn = slab_xrn_object(self.driver.root_auth, node['hostname']) + rspec_node['component_id'] = slab_xrn.urn + rspec_node['component_name'] = node['hostname'] + rspec_node['component_manager_id'] = \ + hrn_to_urn(self.driver.root_auth, 'authority+sa') + + # Senslab's nodes are federated : there is only one authority + # for all Senslab sites, registered in SFA. + # Removing the part including the site + # in authority_id SA 27/07/12 + rspec_node['authority_id'] = rspec_node['component_manager_id'] + + # do not include boot state ( element) + #in the manifest rspec + + rspec_node['boot_state'] = node['boot_state'] - rspec_node['exclusive'] = 'true' - rspec_node['hardware_types'] = [HardwareType({'name': 'slab-sensor'})] - # only doing this because protogeni rspec needs - # to advertise available initscripts - rspec_node['pl_initscripts'] = None - # add site/interface info to nodes. - # assumes that sites, interfaces and tags have already been prepared. - #site = sites_dict[node['site_id']] - #if site['longitude'] and site['latitude']: - #location = Location({'longitude': site['longitude'], 'latitude': site['latitude'], 'country': 'unknown'}) - #rspec_node['location'] = location - if node['posx'] and node['posy']: - location = Location({'longitude':node['posx'], 'latitude': node['posy']}) + if node['hostname'] in reserved_nodes: + rspec_node['boot_state'] = "Reserved" + rspec_node['exclusive'] = 'true' + rspec_node['hardware_types'] = [HardwareType({'name': 'slab-node'})] + + # only doing this because protogeni rspec needs + # to advertise available initscripts + # add site/interface info to nodes. + # assumes that sites, interfaces and tags have already been prepared. + #site = sites_dict[node['site_id']] + location = Location({'country':'France'}) rspec_node['location'] = location - rspec_node['interfaces'] = [] - #if_count=0 - #for if_id in node['interface_ids']: - #interface = Interface(interfaces[if_id]) - #interface['ipv4'] = interface['ip'] - #interface['component_id'] = PlXrn(auth=self.driver.hrn, - #interface='node%s:eth%s' % (node['node_id'], if_count)).get_urn() - # interfaces in the manifest need a client id - #if slice: - #interface['client_id'] = "%s:%s" % (node['node_id'], if_id) - #rspec_node['interfaces'].append(interface) - #if_count+=1 - - #tags = [PLTag(node_tags[tag_id]) for tag_id in node['node_tag_ids']] - rspec_node['tags'] = [] - if node['hrn'] in slivers: - # add sliver info - sliver = slivers[node['node_id']] - rspec_node['sliver_id'] = sliver['sliver_id'] - rspec_node['client_id'] = node['hostname'] - rspec_node['slivers'] = [sliver] - - # slivers always provide the ssh service - #login = Login({'authentication': 'ssh-keys', 'hostname': node['hostname'], 'port':'22', 'username': sliver['name']}) - #service = Services({'login': login}) - #rspec_node['services'] = [service] - rspec_nodes.append(rspec_node) + + + position = SlabPosition() + for field in position : + try: + position[field] = node[field] + except KeyError, error : + logger.log_exc("SLABAGGREGATE\t get_nodes \ + position %s "%(error)) + + rspec_node['position'] = position + #rspec_node['interfaces'] = [] + + # Granularity + granularity = Granularity({'grain': grain}) + rspec_node['granularity'] = granularity + rspec_node['tags'] = [] + if node['hostname'] in slivers: + # add sliver info + sliver = slivers[node['hostname']] + rspec_node['sliver_id'] = sliver['sliver_id'] + rspec_node['client_id'] = node['hostname'] + rspec_node['slivers'] = [sliver] + + # slivers always provide the ssh service + login = Login({'authentication': 'ssh-keys', 'hostname': node['hostname'], 'port':'22', 'username': sliver['name']}) + service = Services({'login': login}) + rspec_node['services'] = [service] + rspec_nodes.append(rspec_node) + return (rspec_nodes) + def get_leases(self, slice_record = None, options = {}): + + now = int(time.time()) + lease_filter = {'clip': now } + + #if slice_record: + #lease_filter.update({'name': slice_record['name']}) + return_fields = ['lease_id', 'hostname', 'site_id', \ + '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: + #as many leases as there are nodes in the job + for node in lease['reserved_nodes']: + rspec_lease = Lease() + rspec_lease['lease_id'] = lease['lease_id'] + #site = node['site_id'] + slab_xrn = slab_xrn_object(self.driver.root_auth, node) + rspec_lease['component_id'] = slab_xrn.urn + #rspec_lease['component_id'] = hostname_to_urn(self.driver.hrn, \ + #site, node['hostname']) + rspec_lease['slice_id'] = lease['slice_id'] + 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 + + + #rspec_leases = [] + #for lease in leases: + + #rspec_lease = Lease() + + ## xxx how to retrieve site['login_base'] + + #rspec_lease['lease_id'] = lease['lease_id'] + #rspec_lease['component_id'] = hostname_to_urn(self.driver.hrn, \ + #site['login_base'], lease['hostname']) + #slice_hrn = slicename_to_hrn(self.driver.hrn, lease['name']) + #slice_urn = hrn_to_urn(slice_hrn, 'slice') + #rspec_lease['slice_id'] = slice_urn + #rspec_lease['t_from'] = lease['t_from'] + #rspec_lease['t_until'] = lease['t_until'] + #rspec_leases.append(rspec_lease) + #return rspec_leases #from plc/aggregate.py def get_rspec(self, slice_xrn=None, version = None, options={}): rspec = None - version_manager = VersionManager() - version = version_manager.get_version(version) - print>>sys.stderr, " \r\n SlabAggregate \t\t get_rspec ************** version %s version_manager %s \r\n" %(version,version_manager) - - if not slice_xrn: - rspec_version = version_manager._get_version(version.type, version.version, 'ad') + version_manager = VersionManager() + version = version_manager.get_version(version) + logger.debug("SlabAggregate \t get_rspec ***version %s \ + version.type %s version.version %s options %s \r\n" \ + %(version,version.type,version.version,options)) + + if not slice_xrn: + rspec_version = version_manager._get_version(version.type, \ + version.version, 'ad') + else: - rspec_version = version_manager._get_version(version.type, version.version, 'manifest') - slice, slivers = self.get_slice_and_slivers(slice_xrn) + rspec_version = version_manager._get_version(version.type, \ + version.version, 'manifest') + + slices, slivers = self.get_slice_and_slivers(slice_xrn) + #at this point sliver may be empty if no senslab job + #is running for this user/slice. rspec = RSpec(version=rspec_version, user_options=options) + + #if slice and 'expires' in slice: #rspec.xml.set('expires', datetime_to_epoch(slice['expires'])) # add sliver defaults - #nodes, links = self.get_nodes_and_links(slice, slivers) - nodes = self.get_nodes_and_links(slice,slivers) - rspec.version.add_nodes(nodes) + #nodes, links = self.get_nodes(slice, slivers) + logger.debug("\r\n \r\n SlabAggregate \tget_rspec ******* slice_xrn %s \r\n \r\n"\ + %(slice_xrn)) + + try: + lease_option = options['list_leases'] + except KeyError: + #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') and options['list_leases'] != 'leases': + nodes = self.get_nodes(slices, slivers) + #In case creating a job, slice_xrn is not set to None + rspec.version.add_nodes(nodes) + if slice_xrn : + #Get user associated with this slice + #user = dbsession.query(RegRecord).filter_by(record_id = \ + #slices['record_id_user']).first() - #rspec.version.add_links(links) - default_sliver = slivers.get(None, []) - if default_sliver: - default_sliver_attribs = default_sliver.get('tags', []) - print>>sys.stderr, " \r\n SlabAggregate \t\t get_rspec ************** default_sliver_attribs %s \r\n" %(default_sliver_attribs) - for attrib in default_sliver_attribs: - print>>sys.stderr, " \r\n SlabAggregate \t\t get_rspec ************** attrib %s \r\n" %(attrib) - logger.info(attrib) - rspec.version.add_default_sliver_attribute(attrib['tagname'], attrib['value']) + #ldap_username = (user.hrn).split('.')[1] + + + #for one_slice in slices : + ldap_username = slices[0]['slice_hrn'] + tmp = ldap_username.split('.') + ldap_username = tmp[1].split('_')[0] + + if version.type == "Slab": + rspec.version.add_connection_information(ldap_username) + default_sliver = slivers.get('default_sliver', []) + if default_sliver: + #default_sliver_attribs = default_sliver.get('tags', []) + logger.debug("SlabAggregate \tget_rspec **** \ + default_sliver%s \r\n" %(default_sliver)) + for attrib in default_sliver: + rspec.version.add_default_sliver_attribute(attrib, \ + default_sliver[attrib]) + if lease_option in ['all','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()