namespace module is gone, plxrn provides PL-specific translations

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

diff --git a/sfa/methods/ListResources.py b/sfa/methods/ListResources.py
index bcc1b23..6afeb49 100644 (file)
--- a/sfa/methods/ListResources.py
+++ b/sfa/methods/ListResources.py
@@ -1,11 +1,12 @@
+import sys
+import zlib
+
 from sfa.util.faults import *
-from sfa.util.namespace 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
-import sys
-import zlib
 
 class ListResources(Method):
     """
@@ -26,7 +27,7 @@ class ListResources(Method):
         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', None)
+        xrn = options.get('geni_slice_urn', '')
         hrn, _ = urn_to_hrn(xrn)
 
         # Find the valid credentials
@@ -38,7 +39,7 @@ class ListResources(Method):
             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']: