From: Tony Mack Date: Sun, 22 Aug 2010 16:50:04 +0000 (+0000) Subject: Pass all creds to the interface managers because they need access to any potential... X-Git-Tag: sfa-1.0-0~25 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c84915a8afc1d64a238686935577b0e84ed8a567;p=sfa.git Pass all creds to the interface managers because they need access to any potential delegated creds, which wont be listed in valid_creds. --- diff --git a/sfa/methods/CreateSliver.py b/sfa/methods/CreateSliver.py index e8f9b94f..c21ceb4f 100644 --- a/sfa/methods/CreateSliver.py +++ b/sfa/methods/CreateSliver.py @@ -46,7 +46,7 @@ class CreateSliver(Method): elif self.api.interface in ['slicemgr']: chain_name = 'FORWARD-OUTGOING' rspec = run_sfatables(chain_name, hrn, origin_hrn, rspec) - allocated = manager.create_slice(self.api, slice_xrn, valid_creds, rspec, users) + allocated = manager.create_slice(self.api, slice_xrn, creds, rspec, users) return rspec diff --git a/sfa/methods/DeleteSliver.py b/sfa/methods/DeleteSliver.py index f5414fb3..3ed3b47b 100644 --- a/sfa/methods/DeleteSliver.py +++ b/sfa/methods/DeleteSliver.py @@ -36,6 +36,6 @@ class DeleteSliver(Method): self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name)) manager = self.api.get_interface_manager() - manager.delete_slice(self.api, xrn, valid_creds) + manager.delete_slice(self.api, xrn, creds) return 1 diff --git a/sfa/methods/ListResources.py b/sfa/methods/ListResources.py index bcc1b236..80b483e1 100644 --- a/sfa/methods/ListResources.py +++ b/sfa/methods/ListResources.py @@ -38,7 +38,7 @@ class ListResources(Method): origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn() # get manager for this interface manager = self.api.get_interface_manager() - rspec = manager.get_rspec(self.api, valid_creds, options) + rspec = manager.get_rspec(self.api, creds, options) # filter rspec through sfatables if self.api.interface in ['aggregate']: diff --git a/sfa/methods/ListSlices.py b/sfa/methods/ListSlices.py index 784effad..236d34f9 100644 --- a/sfa/methods/ListSlices.py +++ b/sfa/methods/ListSlices.py @@ -33,5 +33,5 @@ class ListSlices(Method): self.api.logger.info("interface: %s\tcaller-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, self.name)) manager = self.api.get_interface_manager() - return manager.get_slices(self.api, valid_creds) + return manager.get_slices(self.api, creds) diff --git a/sfa/methods/Start.py b/sfa/methods/Start.py index 26a29589..958e34fa 100644 --- a/sfa/methods/Start.py +++ b/sfa/methods/Start.py @@ -36,6 +36,6 @@ class Start(Method): self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name)) manager = self.api.get_interface_manager() - manager.start_slice(self.api, xrn, valid_creds) + manager.start_slice(self.api, xrn, creds) return 1 diff --git a/sfa/methods/Stop.py b/sfa/methods/Stop.py index 4f2fc8c0..c871e05b 100644 --- a/sfa/methods/Stop.py +++ b/sfa/methods/Stop.py @@ -36,6 +36,6 @@ class Stop(Method): self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name)) manager = self.api.get_interface_manager() - manager.stop_slice(self.api, xrn, valid_creds) + manager.stop_slice(self.api, xrn, creds) return 1