X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager_pl.py;h=894823c1cfbd7cf582ad69b3652f6a2f30fa6abd;hb=24bcba816b14a200542fa6ffb6b318c261292dcd;hp=5355f97b36fb4cba9587dee79cff4ba57e276fac;hpb=725c637b3d6f4e41773b83f7977e2ba962b5b1b7;p=sfa.git diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py index 5355f97b..894823c1 100644 --- a/sfa/managers/aggregate_manager_pl.py +++ b/sfa/managers/aggregate_manager_pl.py @@ -1,3 +1,5 @@ + + import datetime import time import traceback @@ -19,17 +21,28 @@ from sfa.trust.credential import Credential import sfa.plc.peers as peers from sfa.plc.network import * from sfa.plc.api import SfaAPI +from sfa.plc.aggregate import Aggregate from sfa.plc.slices import * from sfa.util.version import version_core +from sfa.rspecs.rspec_version import RSpecVersion +from sfa.rspecs.sfa_rspec import sfa_rspec_version +from sfa.rspecs.pg_rspec import pg_rspec_ad_version, pg_rspec_request_version +from sfa.rspecs.rspec_parser import parse_rspec from sfa.util.sfatime import utcparse from sfa.util.callids import Callids def GetVersion(api): xrn=Xrn(api.hrn) - return version_core({'interface':'aggregate', - 'testbed':'myplc', - 'hrn':xrn.get_hrn(), - }) + request_rspec_versions = [dict(pg_rspec_request_version), dict(sfa_rspec_version)] + ad_rspec_versions = [dict(pg_rspec_ad_version), dict(sfa_rspec_version)] + version_more = {'interface':'aggregate', + 'testbed':'myplc', + 'hrn':xrn.get_hrn(), + 'request_rspec_versions': request_rspec_versions, + 'ad_rspec_versions': ad_rspec_versions, + 'default_ad_rspec': dict(sfa_rspec_version) + } + return version_core(version_more) def __get_registry_objects(slice_xrn, creds, users): """ @@ -95,8 +108,10 @@ def __get_hostnames(nodes): hostnames.append(node.hostname) return hostnames -def slice_status(api, slice_xrn, creds): - hrn, type = urn_to_hrn(slice_xrn) +def SliverStatus(api, slice_xrn, creds, call_id): + if Callids().already_handled(call_id): return {} + + (hrn, type) = urn_to_hrn(slice_xrn) # find out where this slice is currently running api.logger.info(hrn) slicename = hrn_to_pl_slicename(hrn) @@ -106,19 +121,12 @@ def slice_status(api, slice_xrn, creds): raise Exception("Slice %s not found (used %s as slicename internally)" % slice_xrn, slicename) slice = slices[0] - nodes = api.plshell.GetNodes(api.plauth, slice['node_ids'], - ['hostname', 'site_id', 'boot_state', 'last_contact']) + # report about the local nodes only + nodes = api.plshell.GetNodes(api.plauth, {'node_id':slice['node_ids'],'peer_id':None}, + ['hostname', 'site_id', 'boot_state', 'last_contact']) site_ids = [node['site_id'] for node in nodes] sites = api.plshell.GetSites(api.plauth, site_ids, ['site_id', 'login_base']) - sites_dict = {} - for site in sites: - sites_dict[site['site_id']] = site['login_base'] - - # XX remove me - #api.logger.info(slice_xrn) - #api.logger.info(slice) - #api.logger.info(nodes) - # XX remove me + sites_dict = dict ( [ (site['site_id'],site['login_base'] ) for site in sites ] ) result = {} top_level_status = 'unknown' @@ -134,7 +142,7 @@ def slice_status(api, slice_xrn, creds): res['pl_hostname'] = node['hostname'] res['pl_boot_state'] = node['boot_state'] res['pl_last_contact'] = node['last_contact'] - if not node['last_contact'] is None: + if node['last_contact'] is not None: res['pl_last_contact'] = datetime.datetime.fromtimestamp(node['last_contact']).ctime() res['geni_urn'] = hostname_to_urn(api.hrn, sites_dict[node['site_id']], node['hostname']) if node['boot_state'] == 'boot': @@ -154,7 +162,7 @@ def slice_status(api, slice_xrn, creds): # XX remove me return result -def CreateSliver(api, slice_xrn, creds, rspec, users, call_id): +def CreateSliver(api, slice_xrn, creds, rspec_string, users, call_id): """ Create the sliver[s] (slice) at this aggregate. Verify HRN and initialize the slice record in PLC if necessary. @@ -165,6 +173,7 @@ def CreateSliver(api, slice_xrn, creds, rspec, users, call_id): (hrn, type) = urn_to_hrn(slice_xrn) peer = None + aggregate = Aggregate(api) slices = Slices(api) peer = slices.get_peer(hrn) sfa_peer = slices.get_sfa_peer(hrn) @@ -173,40 +182,35 @@ def CreateSliver(api, slice_xrn, creds, rspec, users, call_id): (site_id, remote_site_id) = slices.verify_site(registry, credential, hrn, peer, sfa_peer, reg_objects) - slice_record = slices.verify_slice(registry, credential, hrn, site_id, + slice = slices.verify_slice(registry, credential, hrn, site_id, remote_site_id, peer, sfa_peer, reg_objects) - network = Network(api) - - slice = network.get_slice(api, hrn) - slice.peer_id = slice_record['peer_slice_id'] - current = __get_hostnames(slice.get_nodes()) - - network.addRSpec(rspec, api.config.SFA_AGGREGATE_RSPEC_SCHEMA) - request = __get_hostnames(network.nodesWithSlivers()) - + nodes = api.plshell.GetNodes(api.plauth, slice['node_ids'], ['hostname']) + current_slivers = [node['hostname'] for node in nodes] + rspec = parse_rspec(rspec_string) + requested_slivers = [str(host) for host in rspec.get_nodes_with_slivers()] # remove nodes not in rspec - deleted_nodes = list(set(current).difference(request)) + deleted_nodes = list(set(current_slivers).difference(requested_slivers)) # add nodes from rspec - added_nodes = list(set(request).difference(current)) + added_nodes = list(set(requested_slivers).difference(current_slivers)) try: if peer: - api.plshell.UnBindObjectFromPeer(api.plauth, 'slice', slice.id, peer) + api.plshell.UnBindObjectFromPeer(api.plauth, 'slice', slice['slice_id'], peer) - api.plshell.AddSliceToNodes(api.plauth, slice.name, added_nodes) - api.plshell.DeleteSliceFromNodes(api.plauth, slice.name, deleted_nodes) + api.plshell.AddSliceToNodes(api.plauth, slice['name'], added_nodes) + api.plshell.DeleteSliceFromNodes(api.plauth, slice['name'], deleted_nodes) - network.updateSliceTags() + # TODO: update slice tags + #network.updateSliceTags() finally: if peer: api.plshell.BindObjectToPeer(api.plauth, 'slice', slice.id, peer, slice.peer_id) - # xxx - check this holds enough data for the client to understand what's happened - return network.toxml() + return aggregate.get_rspec(slice_xrn=slice_xrn, version=rspec.version) def RenewSliver(api, xrn, creds, expiration_time, call_id): @@ -279,8 +283,8 @@ def DeleteSliver(api, xrn, creds, call_id): return 1 # xxx Thierry : caching at the aggregate level sounds wrong... -caching=True -#caching=False +#caching=True +caching=False def ListSlices(api, creds, call_id): if Callids().already_handled(call_id): return [] # look in cache first @@ -306,23 +310,31 @@ def ListResources(api, creds, options,call_id): xrn = options.get('geni_slice_urn', '') (hrn, type) = urn_to_hrn(xrn) + # get the rspec's return format from options + rspec_version = RSpecVersion(options.get('rspec_version')) + version_string = "rspec_%s" % (rspec_version.get_version_name()) + + #panos adding the info option to the caching key (can be improved) + if options.get('info'): + version_string = version_string + "_"+options.get('info', 'default') + # look in cache first if caching and api.cache and not xrn: - rspec = api.cache.get('nodes') + rspec = api.cache.get(version_string) if rspec: api.logger.info("aggregate.ListResources: returning cached value for hrn %s"%hrn) return rspec - network = Network(api) - if (hrn): - if network.get_slice(api, hrn): - network.addSlice() + #aggregate = Aggregate(api) + #panos: passing user-defined options + #print "manager options = ",options + aggregate = Aggregate(api, options) - rspec = network.toxml() + rspec = aggregate.get_rspec(slice_xrn=xrn, version=rspec_version) # cache the result if caching and api.cache and not xrn: - api.cache.add('nodes', rspec) + api.cache.add(version_string, rspec) return rspec