X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Fmethods%2FListResources.py;h=f719a8014b47ffb8159620b494d71bfe9bdac427;hp=6afeb4903dfff094754eff52076797e434af8903;hb=HEAD;hpb=ba2aaa438f939a4b5c697052e37b1c3218901319

diff --git a/sfa/methods/ListResources.py b/sfa/methods/ListResources.py
index 6afeb490..f719a801 100644
--- a/sfa/methods/ListResources.py
+++ b/sfa/methods/ListResources.py
@@ -1,56 +1,62 @@
-import sys
 import zlib
 
-from sfa.util.faults import *
 from sfa.util.xrn import urn_to_hrn
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter, Mixed
-from sfa.trust.credential import Credential
 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']
+    interfaces = ['aggregate']
     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))
-        
-        # get slice's hrn from options    
-        xrn = options.get('geni_slice_urn', '')
-        hrn, _ = urn_to_hrn(xrn)
+        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')
 
         # 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)
         if not origin_hrn:
-            origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn()
-        # get manager for this interface    
-        manager = self.api.get_interface_manager()
-        rspec = manager.get_rspec(self.api, 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 
+        # filter rspec through sfatables
         if self.api.interface in ['aggregate']:
             chain_name = 'OUTGOING'
-        elif self.api.interface in ['slicemgr']: 
-            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:
+        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