git://git.onelab.eu
/
plcapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4f87899
)
- fix errors
author
Tony Mack
<tmack@cs.princeton.edu>
Tue, 16 Jan 2007 19:02:20 +0000
(19:02 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Tue, 16 Jan 2007 19:02:20 +0000
(19:02 +0000)
PLC/Methods/SliceInfo.py
patch
|
blob
|
history
diff --git
a/PLC/Methods/SliceInfo.py
b/PLC/Methods/SliceInfo.py
index
94b4bb9
..
3d04979
100644
(file)
--- 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.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
from PLC.Filter import Filter
from PLC.Auth import Auth
from PLC.Slices import Slice, Slices
@@
-52,15
+53,15
@@
class SliceInfo(Method):
slices = filter(lambda slice: slice['slice_id'] in valid_slice_ids, slices)
slices = filter(lambda slice: slice['slice_id'] in valid_slice_ids, slices)
+
for slice in 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:
if return_users:
- slice['users'] = person_ids
+ slice
s[index]
['users'] = person_ids
if return_nodes:
if return_nodes:
- slice['nodes'] = node_ids
- slices.add(slice)
+ slices[index]['nodes'] = node_ids
return slices
return slices