From: Tony Mack Date: Wed, 4 Mar 2009 17:46:01 +0000 (+0000) Subject: list_nodes no longer accepts the 'format' param, always return an rspec X-Git-Tag: sfa-0.9-0@14641~614 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7d572b67627106a0988d0ecb7e0e4a2614505948;p=sfa.git list_nodes no longer accepts the 'format' param, always return an rspec --- diff --git a/geni/aggregate.py b/geni/aggregate.py index ca705fa3..da26cf6d 100644 --- 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) + # How long before we refresh nodes cache 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) - def list_nodes(self, cred, format): + def list_nodes(self, cred): self.decode_authentication(cred, 'listnodes') - return self.getNodes(format) + return self.getNodes() def list_slices(self, cred): self.decode_authentication(cred, 'listslices')