X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FCreateSliver.py;h=96b535dbccd209861952650612121b4322eb30d6;hb=4ff67c801ceeb1d0c7ca2863c2b7bf8152182b8f;hp=4f5801383242f9988a959fdbc3be90c8cc3e53f0;hpb=1d8f724ad7f13734419e5dbc956943e7099d4ff0;p=sfa.git

diff --git a/sfa/methods/CreateSliver.py b/sfa/methods/CreateSliver.py
index 4f580138..96b535db 100644
--- a/sfa/methods/CreateSliver.py
+++ b/sfa/methods/CreateSliver.py
@@ -1,11 +1,9 @@
 from sfa.util.faults import *
-from sfa.util.namespace import *
+from sfa.util.xrn import urn_to_hrn
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter
-from sfatables.runtime import SFATablesRules
-import sys
+from sfa.util.parameter import Parameter, Mixed
+from sfa.util.sfatablesRuntime import run_sfatables
 from sfa.trust.credential import Credential
-from sfa.util.sfalogging import logger
 
 class CreateSliver(Method):
     """
@@ -19,48 +17,37 @@ class CreateSliver(Method):
     @param rspec (string) rspec to allocate
     
     """
-    interfaces = ['geni_am']
+    interfaces = ['aggregate', 'slicemgr']
     accepts = [
         Parameter(str, "Slice URN"),
-        Parameter(type([str]), "List of credentials"),
+        Mixed(Parameter(str, "Credential string"),
+              Parameter(type([str]), "List of credentials")),
         Parameter(str, "RSpec"),
-        Parameter(type([]), "List of user information")
+        Parameter(type([]), "List of user information"),
+        Parameter(str, "call_id"),
         ]
     returns = Parameter(str, "Allocated RSpec")
 
-    def __run_sfatables(self, manager, rules, hrn, origin_hrn, rspec):
-        if rules.sorted_rule_list:
-            contexts = rules.contexts
-            request_context = manager.fetch_context(hrn, origin_hrn, contexts)
-            rules.set_context(request_context)
-            newrspec = rules.apply(rspec)
-        else:    
-            newrspec = rspec
-        return newrspec
-
-
-    def call(self, slice_xrn, creds, rspec, users):
+    def call(self, slice_xrn, creds, rspec, users, call_id=""):
         hrn, type = urn_to_hrn(slice_xrn)
 
         self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, hrn, self.name))
 
         # Find the valid credentials
-        ValidCreds = self.api.auth.checkCredentials(creds, 'createsliver', hrn)
-        origin_hrn = Credential(string=ValidCreds[0]).get_gid_caller().get_hrn()
-
-        manager_base = 'sfa.managers'
-
-        if self.api.interface in ['geni_am']:
-            mgr_type = self.api.config.SFA_GENI_AGGREGATE_TYPE
-            manager_module = manager_base + ".geni_am_%s" % mgr_type
-            manager = __import__(manager_module, fromlist=[manager_base])
-            rspec = self.__run_sfatables(manager, SFATablesRules('INCOMING'),
-                                         hrn, origin_hrn, rspec)
-
-            
-            allocated = manager.CreateSliver(self.api, slice_xrn, ValidCreds, rspec, users)
-            if allocated:
-                return rspec
-
-        return ''
-    
+        valid_creds = self.api.auth.checkCredentials(creds, 'createsliver', hrn)
+        origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn()
+
+        manager = self.api.get_interface_manager()
+        
+        # flter rspec through sfatables
+        if self.api.interface in ['aggregate']:
+            chain_name = 'INCOMING'
+        elif self.api.interface in ['slicemgr']:
+            chain_name = 'FORWARD-INCOMING'
+        self.api.logger.debug("CreateSliver: sfatables on chain %s"%chain_name)
+        rspec = run_sfatables(chain_name, hrn, origin_hrn, rspec)
+        # the aggregate's CreateSliver returns false if call_id was already handled
+        if manager.CreateSliver(self.api, slice_xrn, creds, rspec, users, call_id):
+            return rspec 
+        else:
+            return ""