X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FSliceInfo.py;h=9f36f65440369e5adb113113a9702c1d232f45cc;hb=8b0a5128b2582b1cf41b123680e8d4ec270ac9a3;hp=4f901586171fe52b32e4aa6f75d0baf4c7154f2b;hpb=286cdfc25f6ef8fd3e0ed59a175bcf801b14038a;p=plcapi.git

diff --git a/PLC/Methods/SliceInfo.py b/PLC/Methods/SliceInfo.py
index 4f90158..9f36f65 100644
--- a/PLC/Methods/SliceInfo.py
+++ b/PLC/Methods/SliceInfo.py
@@ -1,4 +1,5 @@
-# $Id#
+# $Id$
+# $URL$
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Faults import *
@@ -13,8 +14,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 +32,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 +56,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