Add an init API function to force the reload of the root intra-extension.

Change-Id: Ieee84a30cbd1ee0a5d4ca3359b7f5afbc39afffc

diff --git a/keystone-moon/keystone/contrib/moon/controllers.py b/keystone-moon/keystone/contrib/moon/controllers.py
index 58e62a2..84e27fa 100644 (file)
--- a/keystone-moon/keystone/contrib/moon/controllers.py
+++ b/keystone-moon/keystone/contrib/moon/controllers.py
@@ -208,6 +208,10 @@ class IntraExtensions(controller.V3Controller):
         intra_extension_dict['description'] = kw.get('intra_extension_description', None)
         return self.admin_api.set_intra_extension_dict(user_id, intra_extension_id, intra_extension_dict)
 
+    @controller.protected()
+    def load_root_intra_extension(self, context, **kw):
+        self.admin_api.load_root_intra_extension_dict()
+
     # Metadata functions
     @controller.protected()
     def get_subject_categories(self, context, **kw):

diff --git a/keystone-moon/keystone/contrib/moon/routers.py b/keystone-moon/keystone/contrib/moon/routers.py
index 357ae06..fd1c0ad 100644 (file)
--- a/keystone-moon/keystone/contrib/moon/routers.py
+++ b/keystone-moon/keystone/contrib/moon/routers.py
@@ -87,6 +87,12 @@ class Routers(wsgi.V3ExtensionRouter):
             })
 
         # IntraExtensions/Admin route
+        self._add_resource(
+            mapper, intra_ext_controller,
+            path=self.PATH_PREFIX+'/intra_extensions/init',
+            get_action='load_root_intra_extension',
+            rel=self._get_rel('intra_extensions'),
+            path_vars={})
         self._add_resource(
             mapper, intra_ext_controller,
             path=self.PATH_PREFIX+'/intra_extensions',

diff --git a/moonclient/moonclient/intraextension.py b/moonclient/moonclient/intraextension.py
index 569a99f..24286dd 100644 (file)
--- a/moonclient/moonclient/intraextension.py
+++ b/moonclient/moonclient/intraextension.py
@@ -110,6 +110,21 @@ class IntraExtensionDelete(Command):
                          authtoken=True)
 
 
+class IntraExtensionInit(Command):
+    """Initialize the root Intra_Extension (if needed)."""
+
+    log = logging.getLogger(__name__)
+
+    def get_parser(self, prog_name):
+        parser = super(IntraExtensionInit, self).get_parser(prog_name)
+        return parser
+
+    def take_action(self, parsed_args):
+        self.app.get_url("/v3/OS-MOON/intra_extensions/init",
+                         method="GET",
+                         authtoken=True)
+
+
 class IntraExtensionShow(ShowOne):
     """Show detail about one Intra_Extension."""
 

diff --git a/moonclient/setup.py b/moonclient/setup.py
index e048bf9..71ea704 100644 (file)
--- a/moonclient/setup.py
+++ b/moonclient/setup.py
@@ -73,6 +73,7 @@ setup(
             'intraextension_list = moonclient.intraextension:IntraExtensionList',
             'intraextension_delete = moonclient.intraextension:IntraExtensionDelete',
             'intraextension_show = moonclient.intraextension:IntraExtensionShow',
+            'intraextension_init = moonclient.intraextension:IntraExtensionInit',
 
             'subject_list = moonclient.subjects:SubjectsList',
             'subject_add = moonclient.subjects:SubjectsAdd',