X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FProvision.py;h=ad196692d4df8db802416c192b29e575ad12266d;hb=3e6097e2d50ff322b45f53fcb22d07fc16adbdb6;hp=21ab93dabfb5b8daef8d267364205474c66b7e5a;hpb=7c97b4323a2ee8c49cf250eb39a36c7609f2b468;p=sfa.git diff --git a/sfa/methods/Provision.py b/sfa/methods/Provision.py index 21ab93da..ad196692 100644 --- a/sfa/methods/Provision.py +++ b/sfa/methods/Provision.py @@ -6,6 +6,7 @@ from sfa.trust.credential import Credential from sfa.storage.parameter import Parameter, Mixed from sfa.rspecs.rspec import RSpec + class Provision(Method): """ Request that the named geni_allocated slivers be made @@ -18,21 +19,26 @@ class Provision(Method): @param slice urns ([string]) URNs of slivers to provision to @param credentials (dict) of credentials @param options (dict) options - + """ interfaces = ['aggregate', 'slicemgr'] accepts = [ Parameter(type([str]), "URNs"), - Parameter(dict, "Credentials"), + Parameter(type([dict]), "Credentials"), Parameter(dict, "options"), - ] + ] returns = Parameter(dict, "Provisioned Resources") def call(self, xrns, creds, options): - self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, xrns, self.name)) + self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s" % + (self.api.interface, xrns, self.name)) # Find the valid credentials - valid_creds = self.api.auth.checkCredentials(creds, 'createsliver', xrns) - origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn() + valid_creds = self.api.auth.checkCredentialsSpeaksFor(creds, 'createsliver', xrns, + check_sliver_callback=self.api.driver.check_sliver_credentials, + options=options) + 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, xrns, self.name)) result = self.api.manager.Provision(self.api, xrns, creds, options) return result