X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FAllocate.py;h=cd3d889dd67223fde309d1a5adfc0e3013b4aa51;hb=fd395e1944dcd49f10a4d5b27ce4983ad389fb96;hp=a9dac0db1411db33a463da06390f81d4eda18eed;hpb=0fe918467c52fd7b06abe8a92082c50ac282f470;p=sfa.git diff --git a/sfa/methods/Allocate.py b/sfa/methods/Allocate.py index a9dac0db..cd3d889d 100644 --- a/sfa/methods/Allocate.py +++ b/sfa/methods/Allocate.py @@ -1,6 +1,6 @@ from sfa.util.faults import SfaInvalidArgument, InvalidRSpec, SfatablesRejected -from sfa.util.sfatime import datetime_to_string -from sfa.util.xrn import Xrn +from sfa.util.sfatime import datetime_to_string +from sfa.util.xrn import Xrn, urn_to_hrn from sfa.util.method import Method from sfa.util.sfatablesRuntime import run_sfatables from sfa.trust.credential import Credential @@ -8,22 +8,42 @@ from sfa.storage.parameter import Parameter, Mixed from sfa.rspecs.rspec import RSpec from sfa.util.sfalogging import logger + class Allocate(Method): """ - Allocate resources as described in a request RSpec argument - to a slice with the named URN. On success, one or more slivers - are allocated, containing resources satisfying the request, and - assigned to the given slice. This method returns a listing and - description of the resources reserved for the slice by this - operation, in the form of a manifest RSpec. Allocated slivers - are held for an aggregate-determined period. Clients must Renew - or Provision slivers before the expiration time (given in the + Allocate resources as described in a request RSpec argument + to a slice with the named URN. On success, one or more slivers + are allocated, containing resources satisfying the request, and + assigned to the given slice. This method returns a listing and + description of the resources reserved for the slice by this + operation, in the form of a manifest RSpec. Allocated slivers + are held for an aggregate-determined period. Clients must Renew + or Provision slivers before the expiration time (given in the return struct), or the aggregate will automatically Delete them. @param slice_urn (string) URN of slice to allocate to @param credentials (dict) of credentials @param rspec (string) rspec to allocate - + @param options (dict) + + As of 3.1.16, the PL driver implements here an important option named + 'pltags' that affects the management of slice tags. + + This option can take 3 values + (*) options['pltags'] == 'ignore' (default) + This is the recommended mode; in this mode all slice tags passed + here are ignore, which correspond to the XML tags in + the areas of incoming rspec to Allocate. + In other words you are guaranteed to leave slice tags alone. + (*) options['pltags'] == 'append' + All incoming slice tags are added to corresponding slivers, + unless an exact match can be found in the PLC db + (*) options['pltags'] == 'sync' + The historical mode, that attempts to leave the PLC db in a state + in sync with the ones specified in incoming rspec. + + See also http://svn.planet-lab.org/wiki/SFASliceTags + """ interfaces = ['aggregate', 'slicemgr'] accepts = [ @@ -31,37 +51,48 @@ class Allocate(Method): Parameter(type([dict]), "List of credentials"), Parameter(str, "RSpec"), Parameter(dict, "options"), - ] + ] returns = Parameter(str, "Allocated RSpec") def call(self, xrn, creds, rspec, options): xrn = Xrn(xrn, type='slice') - self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, xrn.get_hrn(), self.name)) - (speaking_for, _) = urn_to_hrn(options.get('geni_speaking_for')) # Find the valid credentials - valid_creds = self.api.auth.checkCredentials(creds, 'createsliver', xrn.get_hrn(), speaking_for_hrn=speaking_for) - # use the expiration from the first valid credential to determine when + valid_creds = self.api.auth.checkCredentialsSpeaksFor( + creds, 'createsliver', xrn.get_hrn(), options=options) + the_credential = Credential(cred=valid_creds[0]) + + # use the expiration from the first valid credential to determine when # the slivers should expire. - expiration = datetime_to_string(Credential(cred=valid_creds[0]).expiration) - - # make sure request is not empty - slivers = RSpec(rspec).version.get_nodes_with_slivers() - if not slivers: - raise InvalidRSpec("Missing or element. Request rspec must explicitly allocate slivers") + expiration = datetime_to_string(the_credential.expiration) + + logger.debug( + "Allocate, received expiration from credential: %s" % expiration) + +# turned off, as passing an empty rspec is indeed useful for cleaning up the slice +# # make sure request is not empty +# slivers = RSpec(rspec).version.get_nodes_with_slivers() +# if not slivers: +# raise InvalidRSpec("Missing or element. Request rspec must explicitly allocate slivers") # flter rspec through sfatables if self.api.interface in ['aggregate']: chain_name = 'INCOMING' elif self.api.interface in ['slicemgr']: chain_name = 'FORWARD-INCOMING' - self.api.logger.debug("Allocate: sfatables on chain %s"%chain_name) - origin_hrn = Credential(cred=valid_creds[0]).get_gid_caller().get_hrn() - self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, xrn, self.name)) - rspec = run_sfatables(chain_name, xrn.get_hrn(), origin_hrn, rspec) - slivers = RSpec(rspec).version.get_nodes_with_slivers() - if not slivers: - raise SfatablesRejected(slice_xrn) + logger.debug("Allocate: sfatables on chain %s" % chain_name) + actual_caller_hrn = the_credential.actual_caller_hrn() + logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s" % + (self.api.interface, actual_caller_hrn, xrn.get_hrn(), self.name)) + rspec = run_sfatables(chain_name, xrn.get_hrn(), + actual_caller_hrn, rspec) +# turned off, as passing an empty rspec is indeed useful for cleaning up the slice +# slivers = RSpec(rspec).version.get_nodes_with_slivers() +# if not slivers: +# raise SfatablesRejected(slice_xrn) - result = self.api.manager.Allocate(self.api, xrn.get_urn(), creds, rspec, expiration, options) + # pass this to the driver code in case they need it + options['actual_caller_hrn'] = actual_caller_hrn + result = self.api.manager.Allocate( + self.api, xrn.get_urn(), creds, rspec, expiration, options) return result