added more methods

[sfa.git] / geni / methods / slices.py

diff --git a/geni/methods/slices.py b/geni/methods/slices.py
index fc569d0..91134ce 100644 (file)
--- a/geni/methods/slices.py
+++ b/geni/methods/slices.py
@@ -4,7 +4,7 @@ from geni.util.misc import *
 from geni.util.method import Method
 from geni.util.parameter import Parameter, Mixed
 from geni.util.auth import Auth
-from geni.aggregate import Aggregates
+from geni.util.slices import Slices
 
 class slices(Method):
     """
@@ -25,17 +25,6 @@ class slices(Method):
     def call(self, cred):
        
         self.api.auth.check(cred, 'listslices')
-        slice_hrns = []
-
-        if self.api.interface in ['aggregate']:
-            slices = self.api.plshell.GetSlices(self.api.plauth, {}, ['name'])
-            slice_hrns = [slicename_to_hrn(self.api.hrn, slice['name']) for slice in slices]
-        
-        else:
-            aggregates = Aggregates()
-            credential = self.api.getCredential()
-            for aggregate in aggregates:
-                slices = aggregates[aggregate].slices(credential)
-                slice_hrns.extend(slices)    
-            
-        return slice_hrns
+        slices = Slices(self.api)
+        slices.refresh()    
+        return slices['hrn']