Add deletion of secondary keys in core.py and add a forgotten API function in driver (del_aggregation_algorithm) (untested)

Change-Id: I442d874846d375d7266df1567f40110e32ef0c57

1 files changed, 7 insertions, 1 deletions

diff --git a/keystone-moon/keystone/contrib/moon/backends/sql.py b/keystone-moon/keystone/contrib/moon/backends/sql.py
index c2f384bd..ceb057bd 100644
--- a/keystone-moon/keystone/contrib/moon/backends/sql.py
+++ b/keystone-moon/keystone/contrib/moon/backends/sql.py
@@ -306,7 +306,6 @@ class Rule(sql.ModelBase, sql.DictBase):
 
 
 __all_objects__ = (
-    Tenant,
     Subject,
     Object,
     Action,
@@ -901,6 +900,13 @@ class IntraExtensionConnector(IntraExtensionDriver):
             ref = query.first()
             return {ref.id: ref.aggregation_algorithm}
 
+    def del_aggregation_algorithm(self, intra_extension_id, aggregation_algorithm_id):
+        with sql.transaction() as session:
+            query = session.query(AggregationAlgorithm)
+            query = query.filter_by(intra_extension_id=intra_extension_id, id=aggregation_algorithm_id)
+            ref = query.first()
+            session.delete(ref)
+
     # Getter and Setter for sub_meta_rule
 
     def get_sub_meta_rules_dict(self, intra_extension_id):