X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fstart_slice.py;h=ae3ecf8c50dafc70439bd36030735a3db0ac0925;hb=19517e8624d6b3ec3cdcaf51f647b72581941243;hp=65affb080838e0807c333b5e9543ac05e92e737e;hpb=27f6f83b1c2748fff3a8a1bd149d98a44f59f51f;p=sfa.git diff --git a/sfa/methods/start_slice.py b/sfa/methods/start_slice.py index 65affb08..ae3ecf8c 100644 --- a/sfa/methods/start_slice.py +++ b/sfa/methods/start_slice.py @@ -6,7 +6,7 @@ from sfa.util.misc import * from sfa.util.method import Method from sfa.util.parameter import Parameter, Mixed from sfa.trust.auth import Auth -from sfa.plc.slices import Slices +from sfa.trust.credential import Credential class start_slice(Method): """ @@ -17,7 +17,7 @@ class start_slice(Method): @return 1 is successful, faults otherwise """ - interfaces = ['aggregate', 'slicemgr', 'comonent'] + interfaces = ['aggregate', 'slicemgr', 'component'] accepts = [ Parameter(str, "Credential string"), @@ -29,6 +29,13 @@ class start_slice(Method): returns = [Parameter(int, "1 if successful")] def call(self, cred, hrn, request_hash=None): + user_cred = Credential(string=cred) + + #log the call + gid_origin_caller = user_cred.get_gid_origin_caller() + origin_hrn = gid_origin_caller.get_hrn() + self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name)) + # This cred will be an slice cred, not a user, so we cant use it to # authenticate the caller's request_hash. Let just get the caller's gid # from the cred and authenticate using that @@ -41,18 +48,18 @@ class start_slice(Method): manager_base = 'sfa.managers' if self.api.interface in ['component']: mgr_type = self.api.config.SFA_CM_TYPE - manager_module = manger_base + ".component_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager_module = manager_base + ".component_manager_%s" % mgr_type + manager = __import__(manager_module, fromlist=[manager_base]) manager.start_slice(self.api, hrn) elif self.api.interface in ['aggregate']: mgr_type = self.api.config.SFA_AGGREGATE_TYPE - manager_module = manger_base + ".agregate_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager_module = manager_base + ".aggregate_manager_%s" % mgr_type + manager = __import__(manager_module, fromlist=[manager_base]) manager.start_slice(self.api, hrn) - elif self.api.interface in ['slicemngr']: + elif self.api.interface in ['slicemgr']: mgr_type = self.api.config.SFA_SM_TYPE - manager_module = manger_base + ".slice_manager_%s" % mgr_type - manager = __import__(manager_module, manager_base) + manager_module = manager_base + ".slice_manager_%s" % mgr_type + manager = __import__(manager_module, fromlist=[manager_base]) manager.start_slice(self.api, hrn) return 1