git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no change - prettyfied sfi.py (uses format instead of %)
[sfa.git]
/
sfa
/
nitos
/
nitosaggregate.py
diff --git
a/sfa/nitos/nitosaggregate.py
b/sfa/nitos/nitosaggregate.py
index
edf3d93
..
832a2c7
100644
(file)
--- a/
sfa/nitos/nitosaggregate.py
+++ b/
sfa/nitos/nitosaggregate.py
@@
-68,7
+68,9
@@
class NitosAggregate:
- def get_nodes(self, slice_xrn, slice=None,slivers={}, options={}):
+ def get_nodes(self, slice_xrn, slice=None,slivers=None, options=None):
+ if slivers is None: slivers={}
+ if options is None: options={}
# if we are dealing with a slice that has no node just return
# and empty list
if slice_xrn:
# if we are dealing with a slice that has no node just return
# and empty list
if slice_xrn:
@@
-126,8
+128,9
@@
class NitosAggregate:
rspec_nodes.append(rspec_node)
return rspec_nodes
rspec_nodes.append(rspec_node)
return rspec_nodes
- def get_leases_and_channels(self, slice=None, slice_xrn=None, options={}):
-
+ def get_leases_and_channels(self, slice=None, slice_xrn=None, options=None):
+
+ if options is None: options={}
slices = self.driver.shell.getSlices({}, [])
nodes = self.driver.shell.getNodes({}, [])
leases = self.driver.shell.getReservedNodes({}, [])
slices = self.driver.shell.getSlices({}, [])
nodes = self.driver.shell.getNodes({}, [])
leases = self.driver.shell.getReservedNodes({}, [])
@@
-216,8
+219,9
@@
class NitosAggregate:
return (rspec_leases, rspec_channels)
return (rspec_leases, rspec_channels)
- def get_channels(self, slice=None, options={}):
-
+ def get_channels(self, slice=None, options=None):
+ if options is None: options={}
+
all_channels = self.driver.shell.getChannels({}, [])
channels = []
if slice:
all_channels = self.driver.shell.getChannels({}, [])
channels = []
if slice:
@@
-245,7
+249,8
@@
class NitosAggregate:
- def get_rspec(self, slice_xrn=None, version = None, options={}):
+ def get_rspec(self, slice_xrn=None, version = None, options=None):
+ if options is None: options={}
version_manager = VersionManager()
version = version_manager.get_version(version)
version_manager = VersionManager()
version = version_manager.get_version(version)
@@
-277,8
+282,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()