X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fcreate_slice.py;h=67bab8a8ceb381b4296a8c87fa66f37acc4d59f4;hb=46d0dba101b2d2ce041e3627fabadb2bed37d9be;hp=73b3d424cae39eaa89d0b0cf45ad188f77b9ce8e;hpb=1a0d6f5af06a6a8ab5d5ed8899e5e583816696bc;p=sfa.git

diff --git a/sfa/methods/create_slice.py b/sfa/methods/create_slice.py
index 73b3d424..67bab8a8 100644
--- a/sfa/methods/create_slice.py
+++ b/sfa/methods/create_slice.py
@@ -8,8 +8,10 @@ from sfa.util.parameter import Parameter, Mixed
 from sfa.trust.auth import Auth
 from sfa.plc.slices import Slices
 from sfa.util.config import Config
-# RSpecManager_pl is not used. This is just to resolve issues with the dynamic __import__ that comes later.
+# RSpecManager_pl is not used. It's used to make sure the module is in place.
 import sfa.rspecs.aggregates.rspec_manager_pl
+from sfa.trust.credential import Credential
+from sfatables.runtime import SFATablesRules
 
 
 class create_slice(Method):
@@ -28,19 +30,60 @@ class create_slice(Method):
         Parameter(str, "Credential string"),
         Parameter(str, "Human readable name of slice to instantiate"),
         Parameter(str, "Resource specification"),
+        Mixed(Parameter(str, "Request hash"),
+              Parameter(None, "Request hash not specified"))
         ]
 
     returns = Parameter(int, "1 if successful")
     
-    def call(self, cred, hrn, rspec):
-        sfa_aggregate_type = Config().get_aggregate_rspec_type()
+    def call(self, cred, hrn, requested_rspec, request_hash=None, origin_hrn=None):
+        if origin_hrn==None:
+            origin_hrn=Credential(string=cred).get_gid_caller().get_hrn()
+        
+        # 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, requested_rspec], request_hash)
         self.api.auth.check(cred, 'createslice')
-        if (sfa_aggregate_type == 'pl'):
-            slices = Slices(self.api)
-            slices.create_slice(hrn, rspec)    
-        else:
-            # To clean up after July 21 - SB    
-            rspec_manager = __import__("sfa.rspecs.aggregates.rspec_manager_"+sfa_aggregate_type)
+
+        #log the call
+        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
+
+        sfa_aggregate_type = Config().get_aggregate_rspec_type()
+        rspec_manager = __import__("sfa.rspecs.aggregates.rspec_manager_"+sfa_aggregate_type, fromlist = ["sfa.rspecs.aggregates"])
+        #Filter the incoming rspec using sfatables
+        if self.api.interface in ['slicemgr']:
+           incoming_rules = SFATablesRules('FORWARD-INCOMING')
+	elif self.api.interface in ['aggregate']:
+           incoming_rules = SFATablesRules('INCOMING')
+	if incoming_rules.sorted_rule_list:
+           #incoming_rules.set_slice(hrn) # This is a temporary kludge. Eventually, we'd like to fetch the context requested by the match/target
+
+           contexts = incoming_rules.contexts
+           request_context = rspec_manager.fetch_context(hrn, origin_hrn, contexts)
+           incoming_rules.set_context(request_context)
+           rspec = incoming_rules.apply(requested_rspec)
+	else:	
+	   rspec = requested_rspec
+
+        # send the call to the right manager
+        if sfa_aggregate_type not in ['pl']:
+            # To clean up after July 21 - SB
             rspec = rspec_manager.create_slice(self.api, hrn, rspec)
-        
+            return 1
+
+        manager_base = 'sfa.managers'
+        if 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.create_slice(self.api, hrn, rspec)
+        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.create_slice(self.api, hrn, rspec, origin_hrn)
+
         return 1