added support for urn name format. urn is the default name format used over the wire

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

diff --git a/sfa/methods/create_slice.py b/sfa/methods/create_slice.py
index a2b07d5..7c83740 100644 (file)
--- a/sfa/methods/create_slice.py
+++ b/sfa/methods/create_slice.py
@@ -2,15 +2,16 @@
 ### $URL$
 
 from sfa.util.faults import *
 ### $URL$
 
 from sfa.util.faults import *

-from sfa.util.misc import *
+from sfa.util.namespace 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.util.config import Config
 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.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
 import sfa.rspecs.aggregates.rspec_manager_pl
 from sfa.trust.credential import Credential

+from sfatables.runtime import SFATablesRules

 
 
 class create_slice(Method):
 
 
 class create_slice(Method):


@@ -18,7 +19,7 @@ class create_slice(Method):
     Instantiate the specified slice according to whats defined in the specified rspec      
 
     @param cred credential string specifying the rights of the caller
     Instantiate the specified slice according to whats defined in the specified rspec      
 
     @param cred credential string specifying the rights of the caller

-    @param hrn human readable name of slice to instantiate
+    @param hrn human readable name of slice to instantiate (hrn or xrn)

     @param rspec resource specification
     @return 1 is successful, faults otherwise  
     """
     @param rspec resource specification
     @return 1 is successful, faults otherwise  
     """


@@ -27,26 +28,59 @@ class create_slice(Method):
     
     accepts = [
         Parameter(str, "Credential string"),
     
     accepts = [
         Parameter(str, "Credential string"),

-        Parameter(str, "Human readable name of slice to instantiate"),
+        Parameter(str, "Human readable name of slice to instantiate (hrn or xrn)"),

         Parameter(str, "Resource specification"),
         Parameter(str, "Resource specification"),

+        Mixed(Parameter(str, "Human readable name of the original caller"),
+              Parameter(None, "Origin hrn not specified"))

         ]
 
     returns = Parameter(int, "1 if successful")
     
         ]
 
     returns = Parameter(int, "1 if successful")
     

-    def call(self, cred, hrn, rspec, caller_cred=None):
-       if caller_cred==None:
-          caller_cred=cred
-       #log the call
-       self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, Credential(string=caller_cred).get_gid_caller().get_hrn(), hrn, self.name))
+    def call(self, cred, xrn, requested_rspec, origin_hrn=None):
+        hrn, type = urn_to_hrn(xrn) 
+        user_cred = Credential(string=cred)
+        #log the call
+        if not origin_hrn:
+            origin_hrn = user_cred.get_gid_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))
+         
+        # validate the credential
+        self.api.auth.check(cred, 'createslice')

 
         sfa_aggregate_type = Config().get_aggregate_rspec_type()
 
         sfa_aggregate_type = Config().get_aggregate_rspec_type()

-        self.api.auth.check(cred, 'createslice')
-        if (sfa_aggregate_type == 'pl'):
-            slices = Slices(self.api, caller_cred=caller_cred)
-            slices.create_slice(hrn, rspec)    
-        else:
-            # To clean up after July 21 - SB    
-            rspec_manager = __import__("sfa.rspecs.aggregates.rspec_manager_"+sfa_aggregate_type, fromlist = ["sfa.rspecs.aggregates"])
+        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)
             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, xrn, 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, xrn, rspec, origin_hrn)
+

         return 1 
         return 1