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:
a8ff26b
)
list_nodes no longer accepts the 'format' param, always return an rspec
author
Tony Mack
<tmack@cs.princeton.edu>
Wed, 4 Mar 2009 17:46:01 +0000
(17:46 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Wed, 4 Mar 2009 17:46:01 +0000
(17:46 +0000)
geni/aggregate.py
patch
|
blob
|
history
diff --git
a/geni/aggregate.py
b/geni/aggregate.py
index
ca705fa
..
da26cf6
100644
(file)
--- a/
geni/aggregate.py
+++ b/
geni/aggregate.py
@@
-63,6
+63,7
@@
class Aggregate(GeniServer):
timestamp_file = os.sep.join([self.server_basedir, 'agg.' + self.hrn + '.timestamp'])
self.timestamp = SimpleStorage(timestamp_file)
timestamp_file = os.sep.join([self.server_basedir, 'agg.' + self.hrn + '.timestamp'])
self.timestamp = SimpleStorage(timestamp_file)
+ # How long before we refresh nodes cache
self.nodes_ttl = 1
self.connectPLC()
self.nodes_ttl = 1
self.connectPLC()
@@
-469,9
+470,9
@@
class Aggregate(GeniServer):
# XX fix rights, should be function name defined in
# privilege_table (from util/rights.py)
# XX fix rights, should be function name defined in
# privilege_table (from util/rights.py)
- def list_nodes(self, cred
, format
):
+ def list_nodes(self, cred):
self.decode_authentication(cred, 'listnodes')
self.decode_authentication(cred, 'listnodes')
- return self.getNodes(
format
)
+ return self.getNodes()
def list_slices(self, cred):
self.decode_authentication(cred, 'listslices')
def list_slices(self, cred):
self.decode_authentication(cred, 'listslices')