git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7b59ab5
)
make uniform Lease management methods in nitos
author
Mohamed Larabi
<mohamed.larabi@inria.fr>
Tue, 8 Oct 2013 17:06:33 +0000
(19:06 +0200)
committer
Mohamed Larabi
<mohamed.larabi@inria.fr>
Tue, 8 Oct 2013 17:09:44 +0000
(19:09 +0200)
sfa/nitos/nitosaggregate.py
patch
|
blob
|
history
diff --git
a/sfa/nitos/nitosaggregate.py
b/sfa/nitos/nitosaggregate.py
index
edf3d93
..
bb7c56d
100644
(file)
--- a/
sfa/nitos/nitosaggregate.py
+++ b/
sfa/nitos/nitosaggregate.py
@@
-277,8
+277,8
@@
class NitosAggregate:
rspec.version.add_channels(channels)
if not options.get('list_leases') or options.get('list_leases') and options['list_leases'] != 'resources':
rspec.version.add_channels(channels)
if not options.get('list_leases') or options.get('list_leases') and options['list_leases'] != 'resources':
- leases
,
channels = self.get_leases_and_channels(slice, slice_xrn)
- rspec.version.add_leases(leases
,
channels)
+ leases
_
channels = self.get_leases_and_channels(slice, slice_xrn)
+ rspec.version.add_leases(leases
_
channels)
return rspec.toxml()
return rspec.toxml()