renamed api.get_manager() to api.get_interface_manager()

diff --git a/sfa/methods/GetVersion.py b/sfa/methods/GetVersion.py
index fc21028..8552daf 100644 (file)
--- a/sfa/methods/GetVersion.py
+++ b/sfa/methods/GetVersion.py
@@ -15,7 +15,7 @@ class GetVersion(Method):
 
     def call(self):
         self.api.logger.info("interface: %s\tmethod-name: %s" % (self.api.interface, self.name))
-        manager = self.api.get_manager()
+        manager = self.api.get_interface_manager()
     
         return manager.get_version()
     

diff --git a/sfa/methods/ListResources.py b/sfa/methods/ListResources.py
index e2acde6..b107764 100644 (file)
--- a/sfa/methods/ListResources.py
+++ b/sfa/methods/ListResources.py
@@ -3,7 +3,7 @@ from sfa.util.namespace import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
 from sfa.trust.credential import Credential
-from sfatables.runtime import SFATablesRules
+from sfa.util.sfatablesRuntime import run_sfatables
 import sys
 import zlib
 
@@ -37,19 +37,16 @@ class ListResources(Method):
         if not origin_hrn:
             origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn()
             
-        manager = self.api.get_manager()
+        manager = self.api.get_interface_manager()
         rspec = manager.get_rspec(self.api, valid_creds, options)
 
         # filter rspec through sfatables 
         if self.api.interface in ['aggregate', 'geni_am']:
-            outgoing_rules = SFATablesRules('OUTGOING')
+            chain_name = 'OUTGOING'
         elif self.api.interface in ['slicemgr']: 
-            outgoing_rules = SFATablesRules('FORWARD-OUTGOING')
-        filtered_rspec = rspec
-        if outgoing_rules.sorted_rule_list:
-            context = manager.fetch_context(hrn, origin_hrn, outgoing_rules.contexts)
-            outgoing_rules.set_context(context)
-            filtered_rspec = outgoing_rules.apply(rspec)      
+            chain_name = 'FORWARD-OUTGOING'
+
+        filtered_rspec = run_sfatables(chain_name, hrn, origin_hrn, rspec) 
  
         if options.has_key('geni_compressed') and options['geni_compressed'] == True:
             filtered_rspec = zlib.compress(rspec).encode('base64')

diff --git a/sfa/util/api.py b/sfa/util/api.py
index 4b94208..8343969 100644 (file)
--- a/sfa/util/api.py
+++ b/sfa/util/api.py
@@ -138,7 +138,7 @@ class BaseAPI:
         self.aggregates = Aggregates(self)
 
 
-    def get_manager(self, manager_base = 'sfa.managers'):
+    def get_interface_manager(self, manager_base = 'sfa.managers'):
         """
         Returns the appropriate manager module for this interface.
         Modules are usually found in sfa/managers/