get caller's hrn from the credentials gid_origin_caller object

[sfa.git] / sfa / methods / stop_slice.py

diff --git a/sfa/methods/stop_slice.py b/sfa/methods/stop_slice.py
index 8ca6e0f..93a43f8 100644 (file)
--- a/sfa/methods/stop_slice.py
+++ b/sfa/methods/stop_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 stop_slice(Method):
     """
@@ -29,6 +29,13 @@ class stop_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
@@ -42,17 +49,17 @@ class stop_slice(Method):
         if self.api.interface in ['component']:
             mgr_type = self.api.config.SFA_CM_TYPE
             manager_module = manager_base + ".component_manager_%s" % mgr_type
-            manager = __import__(manager_module, fromlist=manager_base)
+            manager = __import__(manager_module, fromlist=[manager_base])
             manager.stop_slice(self.api, hrn)
         elif self.api.interface in ['aggregate']:
             mgr_type = self.api.config.SFA_AGGREGATE_TYPE
-            manager_module = manager_base + ".agregate_manager_%s" % mgr_type
-            manager = __import__(manager_module, fromlist=manager_base)
+            manager_module = manager_base + ".aggregate_manager_%s" % mgr_type
+            manager = __import__(manager_module, fromlist=[manager_base])
             manager.stop_slice(self.api, hrn)
         elif self.api.interface in ['slicemgr']:
             mgr_type = self.api.config.SFA_SM_TYPE
             manager_module = manager_base + ".slice_manager_%s" % mgr_type
-            manager = __import__(manager_module, fromlist=manager_base)
+            manager = __import__(manager_module, fromlist=[manager_base])
             manager.stop_slice(self.api, hrn)
  
         return 1