Looks like that in the recent release of util-vserver, these variables cannot be...

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

diff --git a/sfa/methods/create_slice.py b/sfa/methods/create_slice.py
index 27e034e..e372afe 100644 (file)
--- a/sfa/methods/create_slice.py
+++ b/sfa/methods/create_slice.py
@@ -36,9 +36,9 @@ class create_slice(Method):
 
     returns = Parameter(int, "1 if successful")
     
-    def call(self, cred, hrn, requested_rspec, request_hash=None, caller_cred=None):
-        if caller_cred==None:
-            caller_cred=cred
+    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
@@ -49,19 +49,25 @@ class create_slice(Method):
         self.api.auth.check(cred, 'createslice')
 
         #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))
+        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
-        incoming_rules = SFATablesRules('INCOMING')
-            
-        #incoming_rules.set_slice(hrn) # This is a temporary kludge. Eventually, we'd like to fetch the context requested by the match/target
+        if self.api.interface in ['slicemgr']:
+            incoming_rules = SFATablesRules('FORWARD-INCOMING')
+        elif self.api.interface in ['aggregate']:
+            incoming_rules = SFATablesRules('INCOMING')
 
-        contexts = incoming_rules.contexts
-        request_context = rspec_manager.fetch_context(hrn, Credential(string=caller_cred).get_gid_caller().get_hrn(), contexts)
-        incoming_rules.set_context(request_context)
-        rspec = incoming_rules.apply(requested_rspec)
+        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']:
@@ -72,13 +78,13 @@ class create_slice(Method):
         manager_base = 'sfa.managers'
         if 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.create_slice(self.api, hrn, rspec)
-        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.create_slice(self.api, hrn, rspec)
+            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