X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FListResources.py;h=04359a046be630f472d660ef0f0f8cb3ffec4942;hb=f2282434e40e06365e0fdd3f9bc273a793f41235;hp=e2acde6fba1f6dee2d54aaa72febcc9904437511;hpb=064c0a658ef0cd87e72e9243609b896b9ab4c61f;p=sfa.git

diff --git a/sfa/methods/ListResources.py b/sfa/methods/ListResources.py
index e2acde6f..04359a04 100644
--- a/sfa/methods/ListResources.py
+++ b/sfa/methods/ListResources.py
@@ -1,11 +1,12 @@
-from sfa.util.faults import *
-from sfa.util.namespace import *
+import zlib
+
+from sfa.util.xrn import urn_to_hrn
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter, Mixed
+from sfa.util.sfatablesRuntime import run_sfatables
+from sfa.util.faults import SfaInvalidArgument
 from sfa.trust.credential import Credential
-from sfatables.runtime import SFATablesRules
-import sys
-import zlib
+
+from sfa.storage.parameter import Parameter, Mixed
 
 class ListResources(Method):
     """
@@ -14,7 +15,7 @@ class ListResources(Method):
     @param options dictionary
     @return string
     """
-    interfaces = ['aggregate', 'slicemgr', 'geni_am']
+    interfaces = ['aggregate', 'slicemgr']
     accepts = [
         Mixed(Parameter(str, "Credential string"), 
               Parameter(type([str]), "List of credentials")),
@@ -24,10 +25,17 @@ class ListResources(Method):
 
     def call(self, creds, options):
         self.api.logger.info("interface: %s\tmethod-name: %s" % (self.api.interface, self.name))
-        
+       
+        # client must specify a version
+        if not options.get('geni_rspec_version'):
+            if options.get('rspec_version'):
+                options['geni_rspec_version'] = options['rspec_version']
+            else:
+                raise SfaInvalidArgument('Must specify an rspec version option. geni_rspec_version cannot be null')
+ 
         # get slice's hrn from options    
-        xrn = options.get('geni_slice_urn', None)
-        hrn, _ = urn_to_hrn(xrn)
+        xrn = options.get('geni_slice_urn', '')
+        (hrn, _) = urn_to_hrn(xrn)
 
         # Find the valid credentials
         valid_creds = self.api.auth.checkCredentials(creds, 'listnodes', hrn)
@@ -36,23 +44,18 @@ class ListResources(Method):
         origin_hrn = options.get('origin_hrn', None)
         if not origin_hrn:
             origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn()
-            
-        manager = self.api.get_manager()
-        rspec = manager.get_rspec(self.api, valid_creds, options)
+        rspec = self.api.manager.ListResources(self.api, creds, options)
 
         # filter rspec through sfatables 
-        if self.api.interface in ['aggregate', 'geni_am']:
-            outgoing_rules = SFATablesRules('OUTGOING')
+        if self.api.interface in ['aggregate']:
+            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'
+        self.api.logger.debug("ListResources: sfatables on chain %s"%chain_name)
+        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')
+            filtered_rspec = zlib.compress(filtered_rspec).encode('base64')
 
         return filtered_rspec