X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FListResources.py;h=2ae119a7c90fe510c4220de7cf4de4124d3d83de;hb=fd395e1944dcd49f10a4d5b27ce4983ad389fb96;hp=996adab2a5c296286f0bdef30eee3763ab51d9d2;hpb=dbd15819d950b69d0c6ba5527660969d0754ad29;p=sfa.git

diff --git a/sfa/methods/ListResources.py b/sfa/methods/ListResources.py
index 996adab2..2ae119a7 100644
--- a/sfa/methods/ListResources.py
+++ b/sfa/methods/ListResources.py
@@ -1,65 +1,64 @@
 import zlib
-import sys
+
 from sfa.util.xrn import urn_to_hrn
 from sfa.util.method import Method
 from sfa.util.sfatablesRuntime import run_sfatables
+from sfa.util.sfalogging import logger
+
 from sfa.util.faults import SfaInvalidArgument
 from sfa.trust.credential import Credential
 
 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']
     accepts = [
-        Mixed(Parameter(str, "Credential string"), 
+        Mixed(Parameter(str, "Credential string"),
               Parameter(type([str]), "List of credentials")),
         Parameter(dict, "Options")
-        ]
+    ]
     returns = Parameter(str, "List of resources")
 
     def call(self, creds, options):
-        self.api.logger.info("interface: %s\tmethod-name: %s" % (self.api.interface, self.name))
-       
+        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', '')
-        (hrn, _) = urn_to_hrn(xrn)
-        print >>sys.stderr, " \r\n \r\n \t Lsitresources.pyeuuuuuu call : hrn %s options %s" %( hrn,options ) 
+                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 
+        # get hrn of the original caller
         origin_hrn = options.get('origin_hrn', None)
-        print >>sys.stderr, " \r\n \r\n \t Lsitresources  :origin_hrn %s sansvqalid credss %s " %(origin_hrn, Credential(string=creds[0]).get_gid_caller().get_hrn()) 
         if not origin_hrn:
-            origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn()
-        print >>sys.stderr, " \r\n \r\n \t Lsitresources.py000 call : hrn %s self.api.interface %s  origin_hrn %s   \r\n \r\n \r\n " %(hrn ,self.api.interface,origin_hrn)          
+            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 
+        # filter rspec through sfatables
         if self.api.interface in ['aggregate']:
             chain_name = 'OUTGOING'
-        elif self.api.interface in ['slicemgr']: 
+        elif self.api.interface in ['slicemgr']:
             chain_name = 'FORWARD-OUTGOING'
-        self.api.logger.debug("ListResources: sfatables on chain %s"%chain_name)  
-        print >>sys.stderr, " \r\n \r\n \t Listresources.py001 call : chain_name %s hrn %s origine_hrn %s " %(chain_name, hrn, origin_hrn)
-        filtered_rspec = run_sfatables(chain_name, hrn, origin_hrn, rspec) 
- 
-        if options.has_key('geni_compressed') and options['geni_compressed'] == True:
+        logger.debug(
+            "ListResources: sfatables on chain %s" % chain_name)
+        filtered_rspec = run_sfatables(chain_name, '', origin_hrn, rspec)
+
+        if 'geni_compressed' in options and options['geni_compressed'] == True:
             filtered_rspec = zlib.compress(filtered_rspec).encode('base64')
 
-        return filtered_rspec  
-    
-    
+        return filtered_rspec