X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FListResources.py;h=33777fd7ff2193693a8b3d91cbdc324080464b42;hb=fe5b40a3e021b9c87caf2d1dd9740227759cc05c;hp=386b7f2fd05f18e0f08b53de1002b4ae637d3112;hpb=d58bbc6238ee07a3e386b2627aa64ccb2dce352f;p=sfa.git

diff --git a/sfa/methods/ListResources.py b/sfa/methods/ListResources.py
index 386b7f2f..33777fd7 100644
--- a/sfa/methods/ListResources.py
+++ b/sfa/methods/ListResources.py
@@ -1,5 +1,5 @@
 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
@@ -10,7 +10,7 @@ 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
@@ -23,26 +23,23 @@ class ListResources(Method):
         ]
     returns = Parameter(str, "List of resources")
 
-    def call(self, creds, options={}):
+    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'):
-            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)
+            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()
-        print >>sys.stderr, " \r\n \r\n \t Lsitresources.py call :self.api.interface %s  origin_hrn %s options %s \r\n \t creds %s " %(self.api.interface,origin_hrn,options, creds)          
+            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 
@@ -50,9 +47,8 @@ class ListResources(Method):
             chain_name = 'OUTGOING'
         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.py call : chain_name %s hrn %s origine_hrn %s " %(chain_name, hrn, origin_hrn)
-        filtered_rspec = run_sfatables(chain_name, hrn, origin_hrn, rspec) 
+        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(filtered_rspec).encode('base64')