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
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)})
+ slices = self.driver.GetSlices(slice_filter= str(slice_name), filter_type = 'slice_hrn')
print >>sys.stderr,"\r\n \r\n \t\t_____________ Slabaggregate api get_slice_and_slivers slices %s " %(slices)
if not slices:
return (slice, slivers)
- slice = slices[0]
+ if isinstance(slice, list):
+ slice = slices[0]
+ else:
+ slice =slices
# sort slivers by node id , if there is a job
#and therfore, node allocated to this slice
#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)
#node_tags = self.get_node_tags(tags_filter)
#links = self.get_links(sites_dict, nodes_dict, interfaces)
-
+ reserved_nodes=self.driver.GetReservedNodes()
rspec_nodes = []
for node in nodes:
# skip whitelisted nodes
# 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_id'] = hostname_to_urn(self.driver.root_auth, node['site'], 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')
+ rspec_node['authority_id'] = hrn_to_urn(PlXrn.site_hrn(self.driver.root_auth, node['site']), 'authority+sa')
# do not include boot state (<available> element) in the manifest rspec
if not slice:
rspec_node['boot_state'] = node['boot_state']
- rspec_node['exclusive'] = 'true'
- rspec_node['hardware_types'] = [HardwareType({'name': 'slab-sensor'})]
+ 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
- rspec_node['pl_initscripts'] = None
+ #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']})
rspec_node['location'] = location
- rspec_node['interfaces'] = []
+ #rspec_node['interfaces'] = []
#if_count=0
#for if_id in node['interface_ids']:
#interface = Interface(interfaces[if_id])
#tags = [PLTag(node_tags[tag_id]) for tag_id in node['node_tag_ids']]
rspec_node['tags'] = []
- if node['hrn'] in slivers:
+ if node['hostname'] in slivers:
# add sliver info
- sliver = slivers[node['node_id']]
+ sliver = slivers[node['hostname']]
rspec_node['sliver_id'] = sliver['sliver_id']
rspec_node['client_id'] = node['hostname']
rspec_node['slivers'] = [sliver]
#service = Services({'login': login})
#rspec_node['services'] = [service]
rspec_nodes.append(rspec_node)
+ print>>sys.stderr, "\r\n \r\n \t get_nodes_and_links options %s rspec_nodes[0] %s " %(options,rspec_nodes[0])
return (rspec_nodes)
#from plc/aggregate.py
def get_rspec(self, slice_xrn=None, version = None, options={}):
rspec = None
- version_manager = VersionManager()
+ version_manager = VersionManager()
+
version = version_manager.get_version(version)
- print>>sys.stderr, " \r\n SlabAggregate \t\t get_rspec ************** version %s version_manager %s options %s \r\n" %(version,version_manager,options)
-
+ print>>sys.stderr, " \r\n SlabAggregate \t\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)
#at this point sliver my be {} 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)
+ print>>sys.stderr, " \r\n SlabAggregate \t\t get_rspec ************** options %s rspec_version %s version_manager %s rspec.version %s \r\n" %(options, rspec_version,version_manager, rspec.version)
rspec.version.add_nodes(nodes)
#rspec.version.add_links(links)