From: Tony Mack Date: Tue, 21 Apr 2009 16:45:53 +0000 (+0000) Subject: fix bugs X-Git-Tag: sfa-0.9-0@14641~462 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=32caee770d1e36653c9580e4adaf58a96df7c23d;p=sfa.git fix bugs --- diff --git a/geni/util/nodes.py b/geni/util/nodes.py index 2578abf1..2d4958db 100644 --- a/geni/util/nodes.py +++ b/geni/util/nodes.py @@ -107,7 +107,7 @@ class Nodes(SimpleStorage): for aggregate in aggregates: try: # get the rspec from the aggregate - agg_rspec = aggregates[aggregate].resources(credential) + agg_rspec = aggregates[aggregate].get_resources(credential) # extract the netspec from each aggregates rspec rspec.parseString(agg_rspec) networks.extend([{'NetSpec': rspec.getDictsByTagName('NetSpec')}]) diff --git a/geni/util/slices.py b/geni/util/slices.py index a62fce94..5bfc5ee6 100644 --- a/geni/util/slices.py +++ b/geni/util/slices.py @@ -60,7 +60,7 @@ class Slices(SimpleStorage): credential = self.api.getCredential() for aggregate in aggregates: try: - slices = aggregates[aggregate].slices(credential) + slices = aggregates[aggregate].get_slices(credential) slice_hrns.extend(slices) except: print >> log, "Error calling slices at aggregate %(aggregate)s" % locals()