fix bugs

diff --git a/geni/util/nodes.py b/geni/util/nodes.py
index 2578abf..2d4958d 100644 (file)
--- 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
         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')}])
                 # 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 a62fce9..5bfc5ee 100644 (file)
--- 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:
         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()
                 slice_hrns.extend(slices)
             except:
                 print >> log, "Error calling slices at aggregate %(aggregate)s" % locals()