-#import httplib
-#import json
import time
-
-
-#from sfa.util.config import Config
-from sfa.util.xrn import hrn_to_urn, urn_to_hrn, urn_to_sliver_id
+from sfa.util.xrn import hrn_to_urn, urn_to_hrn, get_authority
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.login import Login
-#from sfa.rspecs.elements.services import Services
+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.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
from sfa.rspecs.elements.versions.slabv1Node import SlabNode
from sfa.util.sfalogging import logger
def __init__(self, driver):
self.driver = driver
- def get_slice_and_slivers(self, slice_xrn):
+ def get_slice_and_slivers(self, slice_xrn, login=None):
"""
Returns a dict of slivers keyed on the sliver's node_id
"""
slice_name = slice_hrn
slices = self.driver.GetSlices(slice_filter= str(slice_name), \
- slice_filter_type = 'slice_hrn')
- logger.debug("Slabaggregate api \tget_slice_and_slivers slices %s " \
- %(slices))
+ slice_filter_type = 'slice_hrn', login=login)
+
+ logger.debug("Slabaggregate api \tget_slice_and_slivers \
+ sfa_slice %s \r\n slices %s self.driver.hrn %s" \
+ %(sfa_slice, slices, self.driver.hrn))
if not slices:
return (sfa_slice, slivers)
#if isinstance(sfa_slice, list):
#and therfore, node allocated to this slice
for sfa_slice in slices:
try:
-
- for node in sfa_slice['node_ids']:
- #node_id = self.driver.root_auth + '.' + node_id
- sliver = Sliver({'sliver_id': urn_to_sliver_id(slice_urn, \
- sfa_slice['record_id_slice'], node['hostname']),
- 'name': sfa_slice['slice_hrn'],
- 'type': 'slab-node',
- 'tags': []})
- logger.log_exc("SLABAGGREGATE \t \
- get_slice_and_slivers node_id %s "%(node))
- slivers[node['hostname']] = sliver
+ node_ids_list = sfa_slice['node_ids']
except KeyError:
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['hrn'],
+ 'type': 'slab-node',
+ 'tags': []})
+
+ slivers[node] = sliver
+
#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}
- ## 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)
+ if get_authority (sfa_slice['hrn']) == self.driver.root_auth:
+ tmp = sfa_slice['hrn'].split('.')
+ ldap_username = tmp[1].split('_')[0]
+ vmaddr = 'ssh ' + ldap_username + '@grenoble.senslab.info'
+ slivers['default_sliver'] = {'vm': vmaddr , 'login': ldap_username}
+
+ #TODO get_slice_and_slivers Find the login of the external user
+
logger.debug("SLABAGGREGATE api get_slice_and_slivers slivers %s "\
%(slivers))
return (slices, slivers)
#if slice_xrn:
#if not slices or not slices['node_ids']:
#return ([],[])
- tags_filter = {}
+ #tags_filter = {}
# get the granularity in second for the reservation system
grain = self.driver.GetLeaseGranularity()
#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
# 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:
- for node in one_slice['node_ids']:
- slice_nodes_list.append(node['hostname'])
+ 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_rspec slice_nodes_list %s "\
+ logger.debug("SLABAGGREGATE api get_nodes slice_nodes_list %s "\
%(slice_nodes_list))
for node in nodes:
# skip whitelisted nodes
#if not slice or slice['slice_id'] not in node['slice_ids_whitelist']:
#continue
#rspec_node = Node()
- logger.debug("SLABAGGREGATE api get_rspec node %s "\
- %(node))
+ #logger.debug("SLABAGGREGATE api get_nodes node %s "\
+ #%(node))
if slice_nodes_list == [] or node['hostname'] in slice_nodes_list:
rspec_node = SlabNode()
# 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
+ # 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 (<available> element) in the manifest rspec
+ # do not include boot state (<available> element)
+ #in the manifest rspec
rspec_node['boot_state'] = node['boot_state']
if node['hostname'] in reserved_nodes:
rspec_node['boot_state'] = "Reserved"
- rspec_node['exclusive'] = 'True'
+ rspec_node['exclusive'] = 'true'
rspec_node['hardware_types'] = [HardwareType({'name': 'slab-node'})]
# 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']]
try:
position[field] = node[field]
except KeyError, error :
- logger.log_exc("SLABAGGREGATE\t get_rspec position %s "%(error))
+ logger.log_exc("SLABAGGREGATE\t get_nodes \
+ position %s "%(error))
rspec_node['position'] = position
#rspec_node['interfaces'] = []
- #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['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]
+ 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)
now = int(time.time())
lease_filter = {'clip': now }
-
- #self.driver.synchronize_oar_and_slice_table()
+
#if slice_record:
#lease_filter.update({'name': slice_record['name']})
return_fields = ['lease_id', 'hostname', 'site_id', \
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['hostname'])
+ #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']
+ try:
+ rspec_lease['slice_id'] = lease['slice_id']
+ except KeyError:
+ #No info on the slice used in slab_xp table
+ pass
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
#from plc/aggregate.py
- def get_rspec(self, slice_xrn=None, version = None, options={}):
+ def get_rspec(self, slice_xrn=None, login=None, version = None, options={}):
rspec = None
version_manager = VersionManager()
rspec_version = version_manager._get_version(version.type, \
version.version, 'manifest')
- slices, slivers = self.get_slice_and_slivers(slice_xrn)
+ slices, slivers = self.get_slice_and_slivers(slice_xrn, login)
#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)
#rspec.xml.set('expires', datetime_to_epoch(slice['expires']))
# add sliver defaults
#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))
+ logger.debug("\r\n \r\n SlabAggregate \tget_rspec ******* slice_xrn %s slices %s\r\n \r\n"\
+ %(slice_xrn, slices))
try:
lease_option = options['list_leases']
except KeyError:
#If no options are specified, at least print the resources
- if slice_xrn :
- lease_option = 'all'
+ 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)
- logger.debug("SlabAggregate \tget_rspec **** \
- nodes %s \r\n" %(nodes))
#In case creating a job, slice_xrn is not set to None
rspec.version.add_nodes(nodes)
if slice_xrn :
#for one_slice in slices :
- ldap_username = slices[0]['slice_hrn']
+ ldap_username = slices[0]['hrn']
tmp = ldap_username.split('.')
ldap_username = tmp[1].split('_')[0]
leases = self.get_leases(slices)
rspec.version.add_leases(leases)
- logger.debug("SlabAggregate \tget_rspec ******* rspec_toxml %s \r\n"\
- %(rspec.toxml()))
+ #logger.debug("SlabAggregate \tget_rspec ******* rspec_toxml %s \r\n"\
+ #%(rspec.toxml()))
return rspec.toxml()
git://git.onelab.eu / sfa.git / blobdiff