Merge "get_aggregation_algorithm_dict now return an empty dictionnary if algorithm is not found."

1 files changed, 4 insertions, 1 deletions

diff --git a/keystone-moon/keystone/contrib/moon/backends/sql.py b/keystone-moon/keystone/contrib/moon/backends/sql.py
index 7cbbd4c0..f08038a2 100644
--- a/keystone-moon/keystone/contrib/moon/backends/sql.py
+++ b/keystone-moon/keystone/contrib/moon/backends/sql.py
@@ -892,7 +892,10 @@ class IntraExtensionConnector(IntraExtensionDriver):
             query = session.query(AggregationAlgorithm)
             query = query.filter_by(intra_extension_id=intra_extension_id)
             ref = query.first()
-            return {ref.id: ref.aggregation_algorithm}
+            try:
+                return {ref.id: ref.aggregation_algorithm}
+            except AttributeError:
+                return {}
 
     def set_aggregation_algorithm_dict(self, intra_extension_id, aggregation_algorithm_id, aggregation_algorithm_dict):
         with sql.transaction() as session: