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:
2e6bd6a
)
fix bug in refresh_components
author
Tony Mack
<tmack@cs.princeton.edu>
Thu, 12 Mar 2009 15:14:39 +0000
(15:14 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Thu, 12 Mar 2009 15:14:39 +0000
(15:14 +0000)
geni/slicemgr.py
patch
|
blob
|
history
diff --git
a/geni/slicemgr.py
b/geni/slicemgr.py
index
da49039
..
dac3856
100644
(file)
--- a/
geni/slicemgr.py
+++ b/
geni/slicemgr.py
@@
-58,7
+58,7
@@
class SliceMgr(GeniServer):
self.nodes = SimpleStorage(nodes_file)
self.nodes.load()
self.nodes = SimpleStorage(nodes_file)
self.nodes.load()
- slices_file = os.sep.join([self.server_basedir, 'smgr' + self.hrn + '.slices'])
+ slices_file = os.sep.join([self.server_basedir, 'smgr
.
' + self.hrn + '.slices'])
self.slices = SimpleStorage(slices_file)
self.slices.load()
self.slices = SimpleStorage(slices_file)
self.slices.load()
@@
-195,17
+195,15
@@
class SliceMgr(GeniServer):
for aggregate in aggregates:
try:
# get the rspec from the aggregate
for aggregate in aggregates:
try:
# get the rspec from the aggregate
- agg_server = self.aggregates[aggregate]
agg_rspec = self.aggregates[aggregate].list_nodes(self.credential)
agg_rspec = self.aggregates[aggregate].list_nodes(self.credential)
-
# extract the netspec from each aggregates rspec
rspec.parseString(agg_rspec)
# extract the netspec from each aggregates rspec
rspec.parseString(agg_rspec)
- networks.extend(
{'NetSpec': rspec.getDictsByTagName('NetSpec')}
)
+ networks.extend(
[{'NetSpec': rspec.getDictsByTagName('NetSpec')}]
)
except:
# XX print out to some error log
print "Error calling list nodes at aggregate %s" % aggregate
raise
except:
# XX print out to some error log
print "Error calling list nodes at aggregate %s" % aggregate
raise
-
+
# create the rspec dict
resources = {'networks': networks, 'start_time': start_time, 'duration': duration}
resourceDict = {'Rspec': resources}
# create the rspec dict
resources = {'networks': networks, 'start_time': start_time, 'duration': duration}
resourceDict = {'Rspec': resources}