From: Tony Mack <tmack@cs.princeton.edu>
Date: Tue, 11 May 2010 19:17:43 +0000 (+0000)
Subject: merging bugfixes from trunk
X-Git-Tag: sfa-0.9-11~3
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=97cef458386e955dcef86c75d05ffedda79bc054

merging bugfixes from trunk
---

diff --git a/sfa/methods/get_aggregates.py b/sfa/methods/get_aggregates.py
index da9859a9..384b0b60 100644
--- a/sfa/methods/get_aggregates.py
+++ b/sfa/methods/get_aggregates.py
@@ -39,8 +39,8 @@ class get_aggregates(Method):
                 hrn_list = hrn
         
         if not hrn_list:
-            interfaces = aggregates.interfaces
+            interfaces = aggregates.interfaces.keys()
         else:
-            interfaces = [interface for interface in aggregates.interfaces if interface['hrn'] in hrn_list]
+            interfaces = [interface for interface in aggregates.interfaces if interface in hrn_list]
       
         return interfaces
diff --git a/sfa/methods/get_registries.py b/sfa/methods/get_registries.py
index 9cbba391..082c5df8 100644
--- a/sfa/methods/get_registries.py
+++ b/sfa/methods/get_registries.py
@@ -39,8 +39,8 @@ class get_registries(Method):
                 hrn_list = hrn
 
         if not hrn_list:
-            interfaces = registries.interfaces
+            interfaces = registries.interfaces.keys()
         else:
-            interfaces = [interface for interface in registries.interfaces if interface['hrn'] in hrn_list]
+            interfaces = [interface for interface in registries.interfaces if interface in hrn_list]
 
         return interfaces