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.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.version_manager import VersionManager
-from sfa.rspecs.elements.versions.slabv1Node import SlabNode
+from sfa.rspecs.elements.versions.slabv1Node import SlabPosition, SlabNode, \
+ SlabLocation
from sfa.util.sfalogging import logger
from sfa.util.xrn import Xrn
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')
+ slice_filter_type = 'slice_hrn', \
+ login=login)
+
logger.debug("Slabaggregate api \tget_slice_and_slivers \
- slices %s self.driver.hrn %s" \
- %(slices, self.driver.hrn))
+ 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):
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',
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}
+ ssh_access = None
+ slivers['default_sliver'] = {'ssh': ssh_access , \
+ 'login': ldap_username}
#TODO get_slice_and_slivers Find the login of the external user
# 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'])
+ 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'] = \
if node['hostname'] in reserved_nodes:
rspec_node['boot_state'] = "Reserved"
rspec_node['exclusive'] = 'true'
- rspec_node['hardware_types'] = [HardwareType({'name': 'slab-node'})]
+ 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'})
+ # assumes that sites, interfaces and tags have already been
+ #prepared.
+
+ location = SlabLocation({'country':'France','site': \
+ node['site']})
rspec_node['location'] = location
-
+
position = SlabPosition()
for field in position :
#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)
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("\r\n \r\n SlabAggregate \ lease_option %s get rspec ******* nodes %s"\
+ %(lease_option, nodes[0]))
+
+ sites_set = set([node['location']['site'] for node in nodes] )
+
#In case creating a job, slice_xrn is not set to None
rspec.version.add_nodes(nodes)
if slice_xrn :
ldap_username = tmp[1].split('_')[0]
if version.type == "Slab":
- rspec.version.add_connection_information(ldap_username)
+ rspec.version.add_connection_information(ldap_username, sites_set)
default_sliver = slivers.get('default_sliver', [])
if default_sliver: