aboutsummaryrefslogtreecommitdiffstats
path: root/keystone-moon/keystone/contrib/moon/controllers.py
diff options
context:
space:
mode:
authorRuan HE <ruan.he@orange.com>2016-01-26 09:28:02 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-26 09:28:02 +0000
commit0386b9ada22d6eae68c1ec008a434ab732410c78 (patch)
tree37a9763c21a927165398886d676ff90706cf4c96 /keystone-moon/keystone/contrib/moon/controllers.py
parent53b0267edfe1d76a17e007941cc7b61d369dcaa4 (diff)
parentdee112e2c8a032cc5cb4583ba0e91323a85fab48 (diff)
Merge "Add the Moon slave service."
Diffstat (limited to 'keystone-moon/keystone/contrib/moon/controllers.py')
-rw-r--r--keystone-moon/keystone/contrib/moon/controllers.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/keystone-moon/keystone/contrib/moon/controllers.py b/keystone-moon/keystone/contrib/moon/controllers.py
index 8541b477..0abe31be 100644
--- a/keystone-moon/keystone/contrib/moon/controllers.py
+++ b/keystone-moon/keystone/contrib/moon/controllers.py
@@ -183,7 +183,8 @@ class IntraExtensions(controller.V3Controller):
intra_extension_dict['aggregation_algorithm'] = kw.get('intra_extension_aggregation_algorithm', dict())
intra_extension_dict['sub_meta_rules'] = kw.get('intra_extension_sub_meta_rules', dict())
intra_extension_dict['rules'] = kw.get('intra_extension_rules', dict())
- return self.admin_api.load_intra_extension_dict(user_id, intra_extension_dict=intra_extension_dict)
+ ref = self.admin_api.load_intra_extension_dict(user_id, intra_extension_dict=intra_extension_dict)
+ return self.admin_api.populate_default_data(ref)
@controller.protected()
def get_intra_extension(self, context, **kw):