group db-related stuff in sfa/storage

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

diff --git a/sfa/methods/ListSlices.py b/sfa/methods/ListSlices.py
index 78a1f6b..e14c9b6 100644 (file)
--- a/sfa/methods/ListSlices.py
+++ b/sfa/methods/ListSlices.py
@@ -1,9 +1,9 @@
-from sfa.util.faults import *
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter, Mixed
-from sfa.trust.auth import Auth
+
 from sfa.trust.credential import Credential
  
+from sfa.storage.parameter import Parameter, Mixed
+
 class ListSlices(Method):
     """
     List the slices instantiated at this interface       
@@ -17,17 +17,17 @@ class ListSlices(Method):
     accepts = [
         Mixed(Parameter(str, "Credential string"),
               Parameter(type([str]), "List of credentials")),
-        Parameter(str, "call_id"),
+        Parameter(dict, "options"),
         ]
 
     returns = Parameter(list, "List of slice names")
     
-    def call(self, creds, call_id=""):
+    def call(self, creds, options={}):
+        valid_creds = self.api.auth.checkCredentials(creds, 'listslices')
+
         #log the call
         origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn()
         self.api.logger.info("interface: %s\tcaller-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, self.name))
 
-        valid_creds = self.api.auth.checkCredentials(creds, 'listslices')
-        manager = self.api.get_interface_manager() 
-        return manager.ListSlices(self.api, creds, call_id)
+        return self.api.manager.ListSlices(self.api, creds, options)