X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fslice_manager_pl.py;h=4aca6fae66d509640be99c885666e70cbce225ed;hb=06b330f0ee047bdb107e43e82b1d7356c876bc15;hp=1d2f695fdeaf66acd638c844ec50db8e8149fcd6;hpb=03366843ff2db5cf7e565cc0445e6ccc61686355;p=sfa.git diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py index 1d2f695f..4aca6fae 100644 --- a/sfa/managers/slice_manager_pl.py +++ b/sfa/managers/slice_manager_pl.py @@ -1,16 +1,17 @@ ### $Id: slices.py 15842 2009-11-22 09:56:13Z anil $ ### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/plc/slices.py $ -import datetime -import time -import traceback import sys -from copy import deepcopy -from lxml import etree +import time,datetime from StringIO import StringIO from types import StringTypes +from copy import deepcopy +from copy import copy +from lxml import etree + +from sfa.util.sfalogging import sfa_logger from sfa.util.rspecHelper import merge_rspecs -from sfa.util.namespace import * +from sfa.util.xrn import urn_to_hrn, hrn_to_urn from sfa.util.rspec import * from sfa.util.specdict import * from sfa.util.faults import * @@ -21,19 +22,50 @@ from sfa.util.sfaticket import * from sfa.trust.credential import Credential from sfa.util.threadmanager import ThreadManager import sfa.util.xmlrpcprotocol as xmlrpcprotocol -from sfa.util.debug import log import sfa.plc.peers as peers def get_version(): version = {} version['geni_api'] = 1 + version['sfa'] = 1 return version def slice_status(api, slice_xrn, creds ): + 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) + api.logger.info("Checking status for %s" % slicename) + slices = api.plshell.GetSlices(api.plauth, [slicename], ['node_ids','person_ids','name','expires']) + if len(slices) == 0: + 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', 'boot_state', 'last_contact']) + api.logger.info(slice) + api.logger.info(nodes) + result = {} result['geni_urn'] = slice_xrn result['geni_status'] = 'unknown' - result['geni_resources'] = {} + result['pl_login'] = slice['name'] + result['pl_expires'] = slice['expires'] + + resources = [] + + for node in nodes: + res = {} + res['pl_hostname'] = node['hostname'] + res['pl_boot_state'] = node['boot_state'] + res['pl_last_contact'] = node['last_contact'] + res['geni_urn'] = '' + res['geni_status'] = 'unknown' + res['geni_error'] = '' + + resources.append(res) + + result['geni_resources'] = resources return result def create_slice(api, xrn, creds, rspec, users): @@ -58,28 +90,47 @@ def create_slice(api, xrn, creds, rspec, users): message = "%s (line %s)" % (error.message, error.line) raise InvalidRSpec(message) - # XX - # XX TODO: Should try to use delegated credential first - # XX - cred = api.getCredential() + # get the callers hrn + valid_cred = api.auth.checkCredentials(creds, 'createsliver', hrn)[0] + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + + # attempt to use delegated credential first + credential = api.getDelegatedCredential(creds) + if not credential: + credential = api.getCredential() threads = ThreadManager() for aggregate in api.aggregates: - if aggregate not in [api.auth.client_cred.get_gid_caller().get_hrn()]: - server = api.aggregates[aggregate] - # Just send entire RSpec to each aggregate - threads.run(server.CreateSliver, xrn, cred, rspec, users) + # prevent infinite loop. Dont send request back to caller + # unless the caller is the aggregate's SM + if caller_hrn == aggregate and aggregate != api.hrn: + continue + + # Just send entire RSpec to each aggregate + server = api.aggregates[aggregate] + threads.run(server.CreateSliver, xrn, credential, rspec, users) results = threads.get_results() merged_rspec = merge_rspecs(results) return merged_rspec def renew_slice(api, xrn, creds, expiration_time): - # XX - # XX TODO: Should try to use delegated credential first - # XX - credential = api.getCredential() + hrn, type = urn_to_hrn(xrn) + + # get the callers hrn + valid_cred = api.auth.checkCredentials(creds, 'renewesliver', hrn)[0] + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + + # attempt to use delegated credential first + credential = api.getDelegatedCredential(creds) + if not credential: + credential = api.getCredential() threads = ThreadManager() for aggregate in api.aggregates: + # prevent infinite loop. Dont send request back to caller + # unless the caller is the aggregate's SM + if caller_hrn == aggregate and aggregate != api.hrn: + continue + server = api.aggregates[aggregate] threads.run(server.RenewSliver, xrn, credential, expiration_time) threads.get_results() @@ -95,10 +146,20 @@ def get_ticket(api, xrn, creds, rspec, users): aggregate_hrn = element.values()[0] aggregate_rspecs[aggregate_hrn] = rspec - # get a ticket from each aggregate - credential = api.getCredential() + # get the callers hrn + valid_cred = api.auth.checkCredentials(creds, 'getticket', slice_hrn)[0] + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + + # attempt to use delegated credential first + credential = api.getDelegatedCredential(creds) + if not credential: + credential = api.getCredential() threads = ThreadManager() for aggregate, aggregate_rspec in aggregate_rspecs.items(): + # prevent infinite loop. Dont send request back to caller + # unless the caller is the aggregate's SM + if caller_hrn == aggregate and aggregate != api.hrn: + continue server = None if aggregate in api.aggregates: server = api.aggregates[aggregate] @@ -106,12 +167,14 @@ def get_ticket(api, xrn, creds, rspec, users): net_urn = hrn_to_urn(aggregate, 'authority') # we may have a peer that knows about this aggregate for agg in api.aggregates: - agg_info = api.aggregates[agg].get_aggregates(credential, net_urn) - if agg_info: - # send the request to this address - url = 'http://%s:%s' % (agg_info['addr'], agg_info['port']) - server = xmlrpcprotocol.get_server(url, api.key_file, api.cert_file) - break + target_aggs = api.aggregates[agg].get_aggregates(credential, net_urn) + if not target_aggs or not 'hrn' in target_aggs[0]: + continue + # send the request to this address + url = target_aggs[0]['url'] + server = xmlrpcprotocol.get_server(url, api.key_file, api.cert_file) + # aggregate found, no need to keep looping + break if server is None: continue threads.run(server.GetTicket, xrn, credential, aggregate_rspec, users) @@ -151,37 +214,67 @@ def get_ticket(api, xrn, creds, rspec, users): return ticket.save_to_string(save_parents=True) -def delete_slice(api, xrn, origin_hrn=None): - # XX - # XX TODO: Should try to use delegated credential first - # XX - credential = api.getCredential() +def delete_slice(api, xrn, creds): + hrn, type = urn_to_hrn(xrn) + + # get the callers hrn + valid_cred = api.auth.checkCredentials(creds, 'deletesliver', hrn)[0] + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + + # attempt to use delegated credential first + credential = api.getDelegatedCredential(creds) + if not credential: + credential = api.getCredential() threads = ThreadManager() for aggregate in api.aggregates: + # prevent infinite loop. Dont send request back to caller + # unless the caller is the aggregate's SM + if caller_hrn == aggregate and aggregate != api.hrn: + continue server = api.aggregates[aggregate] threads.run(server.DeleteSliver, xrn, credential) threads.get_results() return 1 def start_slice(api, xrn, creds): - # XX - # XX TODO: Should try to use delegated credential first - # XX - credential = api.getCredential() + hrn, type = urn_to_hrn(xrn) + + # get the callers hrn + valid_cred = api.auth.checkCredentials(creds, 'startslice', hrn)[0] + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + + # attempt to use delegated credential first + credential = api.getDelegatedCredential(creds) + if not credential: + credential = api.getCredential() threads = ThreadManager() for aggregate in api.aggregates: + # prevent infinite loop. Dont send request back to caller + # unless the caller is the aggregate's SM + if caller_hrn == aggregate and aggregate != api.hrn: + continue server = api.aggregates[aggregate] threads.run(server.Start, xrn, credential) threads.get_results() return 1 def stop_slice(api, xrn, creds): - # XX - # XX TODO: Should try to use delegated credential first - # XX - credential = api.getCredential() + hrn, type = urn_to_hrn(xrn) + + # get the callers hrn + valid_cred = api.auth.checkCredentials(creds, 'stopslice', hrn)[0] + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + + # attempt to use delegated credential first + credential = api.getDelegatedCredential(creds) + if not credential: + credential = api.getCredential() threads = ThreadManager() for aggregate in api.aggregates: + # prevent infinite loop. Dont send request back to caller + # unless the caller is the aggregate's SM + if caller_hrn == aggregate and aggregate != api.hrn: + continue server = api.aggregates[aggregate] threads.run(server.Stop, xrn, credential) threads.get_results() @@ -206,17 +299,28 @@ def status(api, xrn, creds): return 1 def get_slices(api, creds): + # look in cache first if api.cache: slices = api.cache.get('slices') if slices: return slices - # fetch from aggregates - slices = [] - credential = api.getCredential() + # get the callers hrn + valid_cred = api.auth.checkCredentials(creds, 'listslices', None)[0] + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + + # attempt to use delegated credential first + credential = api.getDelegatedCredential(creds) + if not credential: + credential = api.getCredential() threads = ThreadManager() + # fetch from aggregates for aggregate in api.aggregates: + # prevent infinite loop. Dont send request back to caller + # unless the caller is the aggregate's SM + if caller_hrn == aggregate and aggregate != api.hrn: + continue server = api.aggregates[aggregate] threads.run(server.ListSlices, credential) @@ -233,8 +337,9 @@ def get_slices(api, creds): return slices def get_rspec(api, creds, options): + # get slice's hrn from options - xrn = options.get('geni_slice_urn', None) + xrn = options.get('geni_slice_urn', '') hrn, type = urn_to_hrn(xrn) # get hrn of the original caller @@ -250,20 +355,28 @@ def get_rspec(api, creds, options): hrn, type = urn_to_hrn(xrn) rspec = None - # XX - # XX TODO: Should try to use delegated credential first - # XX - cred = api.getCredential() + + # get the callers hrn + valid_cred = api.auth.checkCredentials(creds, 'listnodes', hrn)[0] + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + + # attempt to use delegated credential first + credential = api.getDelegatedCredential(creds) + if not credential: + credential = api.getCredential() threads = ThreadManager() - for aggregate in api.aggregates: - if aggregate not in [api.auth.client_cred.get_gid_caller().get_hrn()]: - # get the rspec from the aggregate - server = api.aggregates[aggregate] - threads.run(server.ListResources, cred, options) - #threads.run(server.get_resources, cred, xrn, origin_hrn) + # prevent infinite loop. Dont send request back to caller + # unless the caller is the aggregate's SM + if caller_hrn == aggregate and aggregate != api.hrn: + continue + # get the rspec from the aggregate + server = api.aggregates[aggregate] + my_opts = copy(options) + my_opts['geni_compressed'] = False + threads.run(server.ListResources, credential, my_opts) + #threads.run(server.get_resources, cred, xrn, origin_hrn) - results = threads.get_results() # combine the rspecs into a single rspec for agg_rspec in results: @@ -283,6 +396,7 @@ def get_rspec(api, creds, options): for request in root.iterfind("./request"): rspec.append(deepcopy(request)) + sfa_logger().debug('get_rspec: rspec=%r'%rspec) rspec = etree.tostring(rspec, xml_declaration=True, pretty_print=True) # cache the result if api.cache and not xrn: