Merge branch 'master' into eucalyptus-devel

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

diff --git a/sfa/methods/ListSlices.py b/sfa/methods/ListSlices.py
index 784effa..fa65b07 100644 (file)
--- a/sfa/methods/ListSlices.py
+++ b/sfa/methods/ListSlices.py
@@ -1,8 +1,4 @@
-### $Id: stop_slice.py 17732 2010-04-19 21:10:45Z tmack $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/stop_slice.py $
-
 from sfa.util.faults import *
-from sfa.util.namespace import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
 from sfa.trust.auth import Auth
@@ -21,11 +17,12 @@ class ListSlices(Method):
     accepts = [
         Mixed(Parameter(str, "Credential string"),
               Parameter(type([str]), "List of credentials")),
+        Parameter(str, "call_id"),
         ]
 
     returns = Parameter(list, "List of slice names")
     
-    def call(self, creds):
+    def call(self, creds, call_id=""):
         valid_creds = self.api.auth.checkCredentials(creds, 'listslices')
 
         #log the call
@@ -33,5 +30,5 @@ class ListSlices(Method):
         self.api.logger.info("interface: %s\tcaller-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, self.name))
 
         manager = self.api.get_interface_manager() 
-        return manager.get_slices(self.api, valid_creds)
+        return manager.ListSlices(self.api, creds, call_id)