Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop

debian/control

@@ -9,7 +9,11 @@ Homepage: https://forge.cadoles.com/Infra/risotto
 Package: python3-risotto
 Architecture: any
 Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
-Depends: ${python:Depends}, ${misc:Depends}, python3-asyncpg, python3-rougail, python3-aiohttp
+Depends: ${python:Depends}, ${misc:Depends},
+	python3-asyncpg,
+	python3-rougail,
+	python3-aiohttp,
+	python3-sdnotify
 Description: configuration manager libraries
 
 Package: risotto

script/risotto-server

@@ -1,13 +1,16 @@
 #!/usr/bin/env python3
+from sdnotify import SystemdNotifier
 from asyncio import get_event_loop
 from risotto import get_app
 
 
 if __name__ == '__main__':
+    notifier = SystemdNotifier()
     loop = get_event_loop()
     loop.run_until_complete(get_app(loop))
-    try:
     print('HTTP server ready')
+    notifier.notify("READY=1")
+    try:
         loop.run_forever()
     except KeyboardInterrupt:
         pass

src/risotto/config.py

@@ -1,6 +1,7 @@
 from os import environ
 from os.path import isfile
 from configobj import ConfigObj
+from uuid import uuid4
 
 
 CONFIG_FILE = environ.get('CONFIG_FILE', '/etc/risotto/risotto.conf')
@@ -84,6 +85,44 @@ if 'TMP_DIR' in environ:
     TMP_DIR = environ['TMP_DIR']
 else:
     TMP_DIR = config.get('TMP_DIR', '/tmp')
+if 'IMAGE_PATH' in environ:
+    IMAGE_PATH = environ['IMAGE_PATH']
+else:
+    IMAGE_PATH = config.get('IMAGE_PATH', '/tmp')
+if 'PASSWORD_ADMIN_USERNAME' in environ:
+    PASSWORD_ADMIN_USERNAME = environ['PASSWORD_ADMIN_USERNAME']
+else:
+    PASSWORD_ADMIN_USERNAME = config.get('PASSWORD_ADMIN_USERNAME', 'risotto')
+if 'PASSWORD_ADMIN_EMAIL' in environ:
+    PASSWORD_ADMIN_EMAIL = environ['PASSWORD_ADMIN_EMAIL']
+else:
+    # this parameter is mandatory
+    PASSWORD_ADMIN_EMAIL = config['PASSWORD_ADMIN_EMAIL']
+if 'PASSWORD_ADMIN_PASSWORD' in environ:
+    PASSWORD_ADMIN_PASSWORD = environ['PASSWORD_ADMIN_PASSWORD']
+else:
+    # this parameter is mandatory
+    PASSWORD_ADMIN_PASSWORD = config['PASSWORD_ADMIN_PASSWORD']
+if 'PASSWORD_DEVICE_IDENTIFIER' in environ:
+    PASSWORD_DEVICE_IDENTIFIER = environ['PASSWORD_DEVICE_IDENTIFIER']
+else:
+    PASSWORD_DEVICE_IDENTIFIER = config.get('PASSWORD_DEVICE_IDENTIFIER', uuid4())
+if 'PASSWORD_URL' in environ:
+    PASSWORD_URL = environ['PASSWORD_URL']
+else:
+    PASSWORD_URL = config.get('PASSWORD_URL', 'https://localhost:8001/')
+if 'PKI_ADMIN_PASSWORD' in environ:
+    PKI_ADMIN_PASSWORD = environ['PKI_ADMIN_PASSWORD']
+else:
+    PKI_ADMIN_PASSWORD = config['PKI_ADMIN_PASSWORD']
+if 'PKI_ADMIN_EMAIL' in environ:
+    PKI_ADMIN_EMAIL = environ['PKI_ADMIN_EMAIL']
+else:
+    PKI_ADMIN_EMAIL = config['PKI_ADMIN_EMAIL']
+if 'PKI_URL' in environ:
+    PKI_URL = environ['PKI_URL']
+else:
+    PKI_URL = config.get('PKI_URL', 'http://localhost:8002')
 
 
 def dsn_factory(database, user, password, address=DB_ADDRESS):
@@ -106,13 +145,24 @@ _config = {'database': {'dsn': dsn_factory(RISOTTO_DB_NAME, RISOTTO_DB_USER, RIS
                       'sql_dir': SQL_DIR,
                       'tmp_dir': TMP_DIR,
                       },
+           'password': {'admin_username': PASSWORD_ADMIN_USERNAME,
+                        'admin_email': PASSWORD_ADMIN_EMAIL,
+                        'admin_password': PASSWORD_ADMIN_PASSWORD,
+                        'device_identifier': PASSWORD_DEVICE_IDENTIFIER,
+                        'service_url': PASSWORD_URL,
+                        },
+           'pki': {'admin_password': PKI_ADMIN_PASSWORD,
+                   'owner': PKI_ADMIN_EMAIL,
+                   'url': PKI_URL,
+                   },
            'cache': {'root_path': CACHE_ROOT_PATH},
            'servermodel': {'internal_source_path': SRV_SEED_PATH,
                            'internal_source': 'internal'},
            'submodule': {'allow_insecure_https': False,
                          'pki': '192.168.56.112'},
            'provider': {'factory_configuration_filename': 'infra.json',
-                        'packer_filename': 'recipe.json'},
+                        'packer_filename': 'recipe.json',
+                        'risotto_images_dir': IMAGE_PATH},
            }
 
 

src/risotto/dispatcher.py

@@ -349,7 +349,7 @@ class Dispatcher(register.RegisterDispatcher,
                 sql = '''
                 SELECT UserId
                 FROM UserUser
-                WHERE UserLogin = $1
+                WHERE Login = $1
                 '''
                 user_id = await connection.fetchval(sql,
                                                     user_login)
@@ -394,10 +394,9 @@ class Dispatcher(register.RegisterDispatcher,
                      ) -> Optional[Dict]:
         # so send the message
         function = function_obj['function']
-        submodule_name = function_obj['module']
+        risotto_context.module = function_obj['module'].split('.', 1)[0]
         function_name = function.__name__
-        risotto_context.module = submodule_name.split('.', 1)[0]
-        info_msg = _(f'in module {submodule_name}.{function_name}')
+        info_msg = _(f"in function {function_obj['full_module_name']}.{function_name}")
         # build argument for this function
         if risotto_context.type == 'rpc':
             kw = config_arguments
@@ -408,7 +407,7 @@ class Dispatcher(register.RegisterDispatcher,
                     kw[key] = value
 
         kw['risotto_context'] = risotto_context
-        returns = await function(self.injected_self[function_obj['module']], **kw)
+        returns = await function(self.get_service(function_obj['module']), **kw)
         if risotto_context.type == 'rpc':
             # valid returns
             await self.valid_call_returns(risotto_context,

src/risotto/http.py

@@ -29,7 +29,8 @@ def create_context(request):
 
 
 def register(version: str,
-             path: str):
+             path: str,
+             ):
     """ Decorator to register function to the http route
     """
     def decorator(function):
@@ -41,7 +42,9 @@ def register(version: str,
 
 
 class extra_route_handler:
-    async def __new__(cls, request):
+    async def __new__(cls,
+                      request,
+                      ):
         kwargs = dict(request.match_info)
         kwargs['request'] = request
         kwargs['risotto_context'] = create_context(request)
@@ -96,11 +99,13 @@ async def handle(request):
             print_exc()
         raise HTTPInternalServerError(reason=str(err))
     return Response(text=dumps({'response': text}),
-                    content_type='application/json')
+                    content_type='application/json',
+                    )
 
 
 async def api(request,
-              risotto_context):
+              risotto_context,
+              ):
     global TIRAMISU
     if not TIRAMISU:
         # check all URI that have an associated role
@@ -152,7 +157,8 @@ async def get_app(loop):
     for version in versions:
         api_route = {'function': api,
                      'version': version,
-                     'path': f'/api/{version}'}
+                     'path': f'/api/{version}',
+                     }
         extra_handler = type(api_route['path'], (extra_route_handler,), api_route)
         routes.append(get(api_route['path'], extra_handler))
         print(f'  - {api_route["path"]} (http_get)')
@@ -174,7 +180,10 @@ async def get_app(loop):
     await dispatcher.register_remote()
     print()
     await dispatcher.on_join()
-    return await loop.create_server(app.make_handler(), '*', get_config()['http_server']['port'])
+    return await loop.create_server(app.make_handler(),
+                                    '*',
+                                    get_config()['http_server']['port'],
+                                    )
 
 
 TIRAMISU = None

src/risotto/register.py

@@ -23,7 +23,7 @@ class Services():
 
     def load_services(self):
         for entry_point in iter_entry_points(group='risotto_services'):
-            self.services.setdefault(entry_point.name, [])
+            self.services.setdefault(entry_point.name, {})
         self.services_loaded = True
 
     def load_modules(self,
@@ -32,21 +32,20 @@ class Services():
         for entry_point in iter_entry_points(group='risotto_modules'):
             service_name, module_name = entry_point.name.split('.')
             if limit_services is None or service_name in limit_services:
-                setattr(self, module_name, entry_point.load())
-                self.services[service_name].append(module_name)
+                self.services[service_name][module_name] = entry_point.load()
         self.modules_loaded = True
-
-    def get_services(self):
-        if not self.services_loaded:
-            self.load_services()
-        return [(s, getattr(self, s)) for s in self.services]
+#
+#    def get_services(self):
+#        if not self.services_loaded:
+#            self.load_services()
+#        return [(service, getattr(self, service)) for service in self.services]
 
     def get_modules(self,
                     limit_services: Optional[List[str]]=None,
                     ) -> List[str]:
         if not self.modules_loaded:
             self.load_modules(limit_services=limit_services)
-        return [(module + '.' + submodule, getattr(self, submodule)) for module, submodules in self.services.items() for submodule in submodules]
+        return [(module + '.' + submodule, entry_point) for module, submodules in self.services.items() for submodule, entry_point in submodules.items()]
 
     def get_services_list(self):
         return self.services.keys()
@@ -199,7 +198,8 @@ class RegisterDispatcher:
             raise RegistrationError(_(f'the message {message} not exists'))
 
         # xxx submodule can only be register with v1.yyy.xxx..... message
-        risotto_module_name, submodule_name = function.__module__.split('.')[-3:-1]
+        full_module_name = function.__module__
+        risotto_module_name, submodule_name = full_module_name.split('.')[-3:-1]
         module_name = risotto_module_name.split('_')[-1]
         message_module, message_submodule, message_name = message.split('.', 2)
         if message_module not in self.risotto_modules:
@@ -224,6 +224,7 @@ class RegisterDispatcher:
         register(version,
                  message,
                  f'{module_name}.{submodule_name}',
+                 full_module_name,
                  function,
                  function_args,
                  notification,
@@ -233,11 +234,13 @@ class RegisterDispatcher:
                      version: str,
                      message: str,
                      module_name: str,
+                     full_module_name: str,
                      function: Callable,
                      function_args: list,
                      notification: Optional[str],
                      ):
         self.messages[version][message]['module'] = module_name
+        self.messages[version][message]['full_module_name'] = full_module_name
         self.messages[version][message]['function'] = function
         self.messages[version][message]['arguments'] = function_args
         if notification:
@@ -247,6 +250,7 @@ class RegisterDispatcher:
                        version: str,
                        message: str,
                        module_name: str,
+                       full_module_name: str,
                        function: Callable,
                        function_args: list,
                        notification: Optional[str],
@@ -255,8 +259,10 @@ class RegisterDispatcher:
             self.messages[version][message]['functions'] = []
 
         dico = {'module': module_name,
+                'full_module_name': full_module_name,
                 'function': function,
-                'arguments': function_args}
+                'arguments': function_args,
+                }
         if notification and notification:
             dico['notification'] = notification
         self.messages[version][message]['functions'].append(dico)
@@ -309,7 +315,7 @@ class RegisterDispatcher:
                     risotto_context.type = None
                     risotto_context.connection = connection
                     risotto_context.module = submodule_name.split('.', 1)[0]
-                    info_msg = _(f'in module risotto_{submodule_name}.on_join')
+                    info_msg = _(f'in function risotto_{submodule_name}.on_join')
                     await log.info_msg(risotto_context,
                                        None,
                                        info_msg)

tests/test_config.py

@@ -392,7 +392,6 @@ async def test_server_created_base():
                              release_distribution='last',
                              site_name='site_1',
                              zones_name=['zones'],
-                             zones_ip=['1.1.1.1'],
                              )
     assert list(config_module.server) == [server_name]
     assert set(config_module.server[server_name]) == {'server', 'server_to_deploy', 'funcs_file'}
@@ -420,7 +419,6 @@ async def test_server_created_own_sm():
                              release_distribution='last',
                              site_name='site_1',
                              zones_name=['zones'],
-                             zones_ip=['1.1.1.1'],
                              )
     assert list(config_module.server) == [server_name]
     assert set(config_module.server[server_name]) == {'server', 'server_to_deploy', 'funcs_file'}
@@ -469,7 +467,6 @@ async def test_server_configuration_get():
                              release_distribution='last',
                              site_name='site_1',
                              zones_name=['zones'],
-                             zones_ip=['1.1.1.1'],
                              )
     #
     await config_module.server[server_name]['server'].property.read_write()
@@ -515,7 +512,6 @@ async def test_server_configuration_deployed():
                              release_distribution='last',
                              site_name='site_1',
                              zones_name=['zones'],
-                             zones_ip=['1.1.1.1'],
                              )
     #
     await config_module.server[server_name]['server'].property.read_write()