X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fslice_manager_pl.py;h=4aca6fae66d509640be99c885666e70cbce225ed;hb=06b330f0ee047bdb107e43e82b1d7356c876bc15;hp=55256e0f7df5ee2d4f11799d8c91c6e658360b61;hpb=2dda62603e6bbb266a885092429ea184ee6740aa;p=sfa.git diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py index 55256e0f..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,9 +22,7 @@ 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 -from copy import copy def get_version(): version = {} @@ -32,10 +31,41 @@ def get_version(): 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): @@ -61,8 +91,8 @@ def create_slice(api, xrn, creds, rspec, users): raise InvalidRSpec(message) # get the callers hrn - valid_cred = self.api.auth.checkCredentials(creds, 'createsliver', hrn)[0] - caller_hrn = valid_cred.get_gid_caller().get_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) @@ -72,7 +102,7 @@ def create_slice(api, xrn, creds, rspec, users): 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 == aggrgate and aggregate != api.hrn: + if caller_hrn == aggregate and aggregate != api.hrn: continue # Just send entire RSpec to each aggregate @@ -84,9 +114,11 @@ def create_slice(api, xrn, creds, rspec, users): return merged_rspec def renew_slice(api, xrn, creds, expiration_time): + hrn, type = urn_to_hrn(xrn) + # get the callers hrn - valid_cred = self.api.auth.checkCredentials(creds, 'renewesliver', hrn)[0] - caller_hrn = valid_cred.get_gid_caller().get_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) @@ -96,7 +128,7 @@ def renew_slice(api, xrn, creds, expiration_time): 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 == aggrgate and aggregate != api.hrn: + if caller_hrn == aggregate and aggregate != api.hrn: continue server = api.aggregates[aggregate] @@ -115,8 +147,8 @@ def get_ticket(api, xrn, creds, rspec, users): aggregate_rspecs[aggregate_hrn] = rspec # get the callers hrn - valid_cred = self.api.auth.checkCredentials(creds, 'getticket', hrn)[0] - caller_hrn = valid_cred.get_gid_caller().get_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) @@ -126,7 +158,7 @@ def get_ticket(api, xrn, creds, rspec, users): 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 == aggrgate and aggregate != api.hrn: + if caller_hrn == aggregate and aggregate != api.hrn: continue server = None if aggregate in api.aggregates: @@ -183,9 +215,11 @@ def get_ticket(api, xrn, creds, rspec, users): def delete_slice(api, xrn, creds): + hrn, type = urn_to_hrn(xrn) + # get the callers hrn - valid_cred = self.api.auth.checkCredentials(creds, 'deletesliver', hrn)[0] - caller_hrn = valid_cred.get_gid_caller().get_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) @@ -195,7 +229,7 @@ def delete_slice(api, xrn, creds): 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 == aggrgate and aggregate != api.hrn: + if caller_hrn == aggregate and aggregate != api.hrn: continue server = api.aggregates[aggregate] threads.run(server.DeleteSliver, xrn, credential) @@ -203,9 +237,11 @@ def delete_slice(api, xrn, creds): return 1 def start_slice(api, xrn, creds): + hrn, type = urn_to_hrn(xrn) + # get the callers hrn - valid_cred = self.api.auth.checkCredentials(creds, 'startslice', hrn)[0] - caller_hrn = valid_cred.get_gid_caller().get_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) @@ -215,7 +251,7 @@ def start_slice(api, xrn, creds): 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 == aggrgate and aggregate != api.hrn: + if caller_hrn == aggregate and aggregate != api.hrn: continue server = api.aggregates[aggregate] threads.run(server.Start, xrn, credential) @@ -223,9 +259,11 @@ def start_slice(api, xrn, creds): return 1 def stop_slice(api, xrn, creds): + hrn, type = urn_to_hrn(xrn) + # get the callers hrn - valid_cred = self.api.auth.checkCredentials(creds, 'stopslice', hrn)[0] - caller_hrn = valid_cred.get_gid_caller().get_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) @@ -235,7 +273,7 @@ def stop_slice(api, xrn, creds): 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 == aggrgate and aggregate != api.hrn: + if caller_hrn == aggregate and aggregate != api.hrn: continue server = api.aggregates[aggregate] threads.run(server.Stop, xrn, credential) @@ -269,8 +307,8 @@ def get_slices(api, creds): return slices # get the callers hrn - valid_cred = self.api.auth.checkCredentials(creds, 'listslices', hrn)[0] - caller_hrn = valid_cred.get_gid_caller().get_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) @@ -281,7 +319,7 @@ def get_slices(api, creds): 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 == aggrgate and aggregate != api.hrn: + if caller_hrn == aggregate and aggregate != api.hrn: continue server = api.aggregates[aggregate] threads.run(server.ListSlices, credential) @@ -301,7 +339,7 @@ def get_slices(api, creds): 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 @@ -319,8 +357,8 @@ def get_rspec(api, creds, options): rspec = None # get the callers hrn - valid_cred = self.api.auth.checkCredentials(creds, 'listnodes', hrn)[0] - caller_hrn = valid_cred.get_gid_caller().get_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) @@ -330,7 +368,7 @@ def get_rspec(api, creds, options): 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 == aggrgate and aggregate != api.hrn: + if caller_hrn == aggregate and aggregate != api.hrn: continue # get the rspec from the aggregate server = api.aggregates[aggregate] @@ -358,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: