one more fix to renewsliver

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

diff --git a/sfa/methods/ListResources.py b/sfa/methods/ListResources.py
index b107764..80b483e 100644 (file)
--- a/sfa/methods/ListResources.py
+++ b/sfa/methods/ListResources.py
@@ -14,7 +14,7 @@ class ListResources(Method):
     @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")),
@@ -36,20 +36,19 @@ class ListResources(Method):
         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, valid_creds, options)
+        rspec = manager.get_rspec(self.api, creds, options)
 
         # filter rspec through sfatables 
-        if self.api.interface in ['aggregate', 'geni_am']:
+        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:
-            filtered_rspec = zlib.compress(rspec).encode('base64')
+            filtered_rspec = zlib.compress(filtered_rspec).encode('base64')
 
         return filtered_rspec