2to3 -f has_key

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

diff --git a/sfa/methods/ListResources.py b/sfa/methods/ListResources.py
index e2acde6..795594b 100644 (file)
--- a/sfa/methods/ListResources.py
+++ b/sfa/methods/ListResources.py
@@ -1,20 +1,21 @@
-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):
     """
-    Returns information about available resources or resources allocated to this slice
+    Returns information about available resources
     @param credential list
     @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,35 +25,33 @@ class ListResources(Method):
 
     def call(self, creds, options):
         self.api.logger.info("interface: %s\tmethod-name: %s" % (self.api.interface, self.name))
-        
-        # get slice's hrn from options    
-        xrn = options.get('geni_slice_urn', None)
-        hrn, _ = urn_to_hrn(xrn)
+       
+        # 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')
 
         # Find the valid credentials
-        valid_creds = self.api.auth.checkCredentials(creds, 'listnodes', hrn)
+        valid_creds = self.api.auth.checkCredentialsSpeaksFor(creds, 'listnodes', options=options)
 
         # get hrn of the original caller 
         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)
+            origin_hrn = Credential(cred=valid_creds[0]).get_gid_caller().get_hrn()
+        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, '', origin_hrn, rspec) 
  
-        if options.has_key('geni_compressed') and options['geni_compressed'] == True:
-            filtered_rspec = zlib.compress(rspec).encode('base64')
+        if 'geni_compressed' in options and options['geni_compressed'] == True:
+            filtered_rspec = zlib.compress(filtered_rspec).encode('base64')
 
         return filtered_rspec