passing slice_hrn to federated aggregates in get_ticket

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

diff --git a/sfa/methods/start_slice.py b/sfa/methods/start_slice.py
index 074e7de..37f7ea0 100644 (file)
--- a/sfa/methods/start_slice.py
+++ b/sfa/methods/start_slice.py
@@ -5,8 +5,8 @@ from sfa.util.faults import *
 from sfa.util.misc import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
-from sfa.util.slices import Slices
+from sfa.trust.auth import Auth
+from sfa.trust.credential import Credential
 
 class start_slice(Method):
     """
@@ -17,19 +17,42 @@ class start_slice(Method):
     @return 1 is successful, faults otherwise  
     """
 
-    interfaces = ['aggregate', 'slicemgr']
+    interfaces = ['aggregate', 'slicemgr', 'component']
     
     accepts = [
         Parameter(str, "Credential string"),
         Parameter(str, "Human readable name of slice to instantiate"),
+        Mixed(Parameter(str, "Request hash"),
+              Parameter(None, "Request hash not specified"))
         ]
 
     returns = [Parameter(int, "1 if successful")]
     
-    def call(self, cred, hrn):
-       
+    def call(self, cred, hrn, request_hash=None):
+        # 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
+        client_gid = Credential(string=cred).get_gid_caller()
+        client_gid_str = client_gid.save_to_string(save_parents=True)
+        self.api.auth.authenticateGid(client_gid_str, [cred, hrn], request_hash)
         self.api.auth.check(cred, 'startslice')
-        slices = Slices(self.api)
-        slices.start_slice(hrn)
-        
+       
+        # send the call to the right manager
+        manager_base = 'sfa.managers'
+        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.start_slice(self.api, hrn)
+        elif self.api.interface in ['aggregate']:
+            mgr_type = self.api.config.SFA_AGGREGATE_TYPE
+            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 ['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.start_slice(self.api, hrn)
+ 
         return 1