Merge branch 'master' into senslab2

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

diff --git a/sfa/methods/ListResources.py b/sfa/methods/ListResources.py
index c13baa7..41676e6 100644 (file)
--- a/sfa/methods/ListResources.py
+++ b/sfa/methods/ListResources.py
@@ -1,9 +1,9 @@
 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.faults import InvalidRSpecVersion
+from sfa.util.faults import SfaInvalidArgument
 from sfa.trust.credential import Credential
 
 from sfa.storage.parameter import Parameter, Mixed
@@ -23,12 +23,15 @@ 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('rspec_version'):
-            raise InvalidRSpecVersion('Must specify an rspec version option. rspec_version cannot be null')
+        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', '')
@@ -39,8 +42,10 @@ class ListResources(Method):
 
         # 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)          
         rspec = self.api.manager.ListResources(self.api, creds, options)
 
         # filter rspec through sfatables 
@@ -48,7 +53,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)
+        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) 
  
         if options.has_key('geni_compressed') and options['geni_compressed'] == True: