aboutsummaryrefslogtreecommitdiffstats
path: root/keystone-moon
diff options
context:
space:
mode:
authorWuKong <rebirthmonkey@gmail.com>2015-07-08 18:42:14 +0200
committerWuKong <rebirthmonkey@gmail.com>2015-07-08 18:42:14 +0200
commite1dbe5fb59671069ac69fb44fdfd1e9bef71bcaa (patch)
tree73445808f320eca9fabd29724432ad45b79d3bfa /keystone-moon
parente4d3af31c2835909abafafd3711822fe4eed2a84 (diff)
change function name get_rules to get_rule_dict
Change-Id: I21cdd5c2aa3ecb7883fca409573f11f3d28bf43a Signed-off-by: WuKong <rebirthmonkey@gmail.com>
Diffstat (limited to 'keystone-moon')
-rw-r--r--keystone-moon/keystone/contrib/moon/backends/sql.py14
-rw-r--r--keystone-moon/keystone/contrib/moon/core.py6
2 files changed, 10 insertions, 10 deletions
diff --git a/keystone-moon/keystone/contrib/moon/backends/sql.py b/keystone-moon/keystone/contrib/moon/backends/sql.py
index 1b164dec..361e53ed 100644
--- a/keystone-moon/keystone/contrib/moon/backends/sql.py
+++ b/keystone-moon/keystone/contrib/moon/backends/sql.py
@@ -1385,14 +1385,14 @@ class IntraExtensionConnector(IntraExtensionDriver):
raise IntraExtensionNotFound()
return ref.to_dict()
- def set_meta_rule_dict(self, extension_uuid, meta_rule):
+ def set_meta_rule_dict(self, extension_uuid, meta_rule_dict):
with sql.transaction() as session:
query = session.query(MetaRule)
query = query.filter_by(intra_extension_uuid=extension_uuid)
ref = query.first()
- meta_rule["id"] = uuid4().hex
- meta_rule["intra_extension_uuid"] = extension_uuid
- new_ref = MetaRule.from_dict(meta_rule)
+ meta_rule_dict["id"] = uuid4().hex
+ meta_rule_dict["intra_extension_uuid"] = extension_uuid
+ new_ref = MetaRule.from_dict(meta_rule_dict)
if not ref:
session.add(new_ref)
ref = new_ref
@@ -1404,7 +1404,7 @@ class IntraExtensionConnector(IntraExtensionDriver):
# Getter and Setter for rules
- def get_rules(self, extension_uuid):
+ def get_rule_dict(self, extension_uuid):
with sql.transaction() as session:
query = session.query(Rule)
query = query.filter_by(intra_extension_uuid=extension_uuid)
@@ -1413,7 +1413,7 @@ class IntraExtensionConnector(IntraExtensionDriver):
raise IntraExtensionNotFound()
return ref.to_dict()
- def set_rules(self, extension_uuid, subrules):
+ def set_rule_dict(self, extension_uuid, rule_dict):
with sql.transaction() as session:
query = session.query(Rule)
query = query.filter_by(intra_extension_uuid=extension_uuid)
@@ -1421,7 +1421,7 @@ class IntraExtensionConnector(IntraExtensionDriver):
rules = dict()
rules["id"] = uuid4().hex
rules["intra_extension_uuid"] = extension_uuid
- rules["rules"] = subrules
+ rules["rules"] = rule_dict
new_ref = Rule.from_dict(rules)
if not ref:
session.add(new_ref)
diff --git a/keystone-moon/keystone/contrib/moon/core.py b/keystone-moon/keystone/contrib/moon/core.py
index ecbb6a90..28f8c0d1 100644
--- a/keystone-moon/keystone/contrib/moon/core.py
+++ b/keystone-moon/keystone/contrib/moon/core.py
@@ -2133,7 +2133,7 @@ class IntraExtensionDriver(object):
"""
raise exception.NotImplemented() # pragma: no cover
- def set_meta_rule_dict(self, extension_uuid, meta_rule):
+ def set_meta_rule_dict(self, extension_uuid, meta_rule_dict):
"""Set the Meta rule
:param extension_uuid: IntraExtension UUID
@@ -2158,7 +2158,7 @@ class IntraExtensionDriver(object):
# Getter and Setter for rules
- def get_rules(self, extension_uuid):
+ def get_rule_dict(self, extension_uuid):
"""Get all rules
:param extension_uuid: IntraExtension UUID
@@ -2176,7 +2176,7 @@ class IntraExtensionDriver(object):
"""
raise exception.NotImplemented() # pragma: no cover
- def set_rules(self, extension_uuid, rules):
+ def set_rule_dict(self, extension_uuid, rule_dict):
"""Set all rules
:param extension_uuid: IntraExtension UUID