X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FSliceInfo.py;h=3d04979b5774898fede35847856e3fa50b4019b4;hb=6c38f39a5bd62c83ed181f1fe1e47f67446e7dec;hp=5be35d6fb746aa1e2c5806930e93031a3f2f0a97;hpb=bc15dc8096f4465bb8c3e9da2177b010828fe5b5;p=plcapi.git

diff --git a/PLC/Methods/SliceInfo.py b/PLC/Methods/SliceInfo.py
index 5be35d6..3d04979 100644
--- a/PLC/Methods/SliceInfo.py
+++ b/PLC/Methods/SliceInfo.py
@@ -1,5 +1,6 @@
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
+from PLC.Faults import *
 from PLC.Filter import Filter
 from PLC.Auth import Auth
 from PLC.Slices import Slice, Slices
@@ -23,8 +24,8 @@ class SliceInfo(Method):
 
     accepts = [
         Auth(),
-        [Mixed(Slice.fields['name']],
-        Parameter(bool, "Whether or not to return users for the slices", nullok = True)
+        [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)
         ]
 
@@ -52,15 +53,15 @@ class SliceInfo(Method):
 	
 	    slices = filter(lambda slice: slice['slice_id'] in valid_slice_ids, slices)
 
+
 	for slice in slices:
-	    slices.pop(slice)
-	    person_ids = slice.pop('person_ids')
-	    node_ids = slice.pop('node_ids')
+	    index = slices.index(slice)
+	    node_ids = slices[index].pop('node_ids')
+	    person_ids = slices[index].pop('person_ids')
 	    if return_users:
-		slice['users'] = person_ids
+		slices[index]['users'] = person_ids
 	    if return_nodes:
-	        slice['nodes'] = node_ids
-	    slices.add(slice)
+	        slices[index]['nodes'] = node_ids
 		
 	
         return slices