X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FSliceInfo.py;h=2182c6eecd90d24587b90d548eb4678e03807ef4;hb=4e770b3cf4e6b16150fd479ace9854eaee3399b6;hp=cfe815e78f2e180dbe7aae328ef3e0cd10b7ecc0;hpb=77e4f177dfee85705c36298c3230b2e4a3e73467;p=plcapi.git

diff --git a/PLC/Methods/SliceInfo.py b/PLC/Methods/SliceInfo.py
index cfe815e..2182c6e 100644
--- a/PLC/Methods/SliceInfo.py
+++ b/PLC/Methods/SliceInfo.py
@@ -1,4 +1,3 @@
-# $Id$
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Faults import *
@@ -13,8 +12,8 @@ class SliceInfo(Method):
     """
     Deprecated. Can be implemented with GetSlices.
 
-    Returns an array of structs containing details about slices. 
-    The summary can optionally include the list of nodes in and 
+    Returns an array of structs containing details about slices.
+    The summary can optionally include the list of nodes in and
     users of each slice.
 
     Users may only query slices of which they are members. PIs may
@@ -31,18 +30,18 @@ class SliceInfo(Method):
         Auth(),
         [Mixed(Slice.fields['name'])],
         Parameter(bool, "Whether or not to return users for the slices", nullok = True),
-	Parameter(bool, "Whether or not to return nodes for the slices", nullok = True)
+        Parameter(bool, "Whether or not to return nodes for the slices", nullok = True)
         ]
 
     returns = [Slice.fields]
-    
+
 
     def call(self, auth, slice_name_list=None, return_users=None, return_nodes=None):
-	# If we are not admin, make sure to return only viewable
-	# slices.
-	slice_filter = slice_name_list
-	slices = Slices(self.api, slice_filter)
-	if not slices:
+        # If we are not admin, make sure to return only viewable
+        # slices.
+        slice_filter = slice_name_list
+        slices = Slices(self.api, slice_filter)
+        if not slices:
             raise PLCInvalidArgument, "No such slice"
 
         if 'admin' not in self.caller['roles']:
@@ -55,22 +54,22 @@ class SliceInfo(Method):
 
             if not valid_slice_ids:
                 return []
-	
-	    slices = filter(lambda slice: slice['slice_id'] in valid_slice_ids, slices)
-
-
-	for slice in slices:
-	    index = slices.index(slice)
-	    node_ids = slices[index].pop('node_ids')
-	    person_ids = slices[index].pop('person_ids')
-	    if return_users or return_users is None:
-		persons = Persons(self.api, person_ids)
-		emails = [person['email'] for person in persons]
-		slices[index]['users'] = emails
-	    if return_nodes or return_nodes is None:
-		nodes = Nodes(self.api, node_ids)
-		hostnames = [node['hostname'] for node in nodes]
-	        slices[index]['nodes'] = hostnames
-		
-	
+
+            slices = filter(lambda slice: slice['slice_id'] in valid_slice_ids, slices)
+
+
+        for slice in slices:
+            index = slices.index(slice)
+            node_ids = slices[index].pop('node_ids')
+            person_ids = slices[index].pop('person_ids')
+            if return_users or return_users is None:
+                persons = Persons(self.api, person_ids)
+                emails = [person['email'] for person in persons]
+                slices[index]['users'] = emails
+            if return_nodes or return_nodes is None:
+                nodes = Nodes(self.api, node_ids)
+                hostnames = [node['hostname'] for node in nodes]
+                slices[index]['nodes'] = hostnames
+
+
         return slices