From: Tony Mack <tmack@cs.princeton.edu>
Date: Fri, 6 Feb 2009 04:12:04 +0000 (+0000)
Subject: fix bug in getComponents, return nodes in the format the user requested
X-Git-Tag: sfa-0.9-0@14641~661
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=acb87a7648c9a74122eaccc60af5f21566a57db3;p=sfa.git

fix bug in getComponents, return nodes in the format the user requested
---

diff --git a/geni/aggregate.py b/geni/aggregate.py
index acaf16e8..533b365d 100644
--- a/geni/aggregate.py
+++ b/geni/aggregate.py
@@ -244,7 +244,7 @@ class Aggregate(GeniServer):
             self.refresh_components()
         elif now < self.threshold and not self.nodes.keys(): 
             self.load_components()
-        return self.nodes.keys()
+        return self.nodes[type]
     
     def getSlices(self, hrn):
         """
@@ -263,7 +263,6 @@ class Aggregate(GeniServer):
         if type in ['aggregate']:
             nodes = self.shell.GetNodes(self.auth)
         elif type in ['slice']:
-            print hrn
             slicename = hrn_to_pl_slicename(hrn)
             slices = self.shell.GetSlices(self.auth, [slicename])
             node_ids = slices[0]['node_ids']