Compare commits
33 Commits
develop
...
pkg/dev/ri
Author | SHA1 | Date | |
---|---|---|---|
fc5a13152b | |||
617ef55dd3 | |||
8c5a2bb702 | |||
92846052b1 | |||
c63170be1d | |||
2a98575790 | |||
52209a5ebd | |||
b0edfb7b01 | |||
cb4dde1dc4 | |||
c740ec3fe3 | |||
56b1f12a4a | |||
4fc3e74bbd | |||
83d74c2b06 | |||
6a27b002ff | |||
e2d73932c0 | |||
980a119ef9 | |||
b9da2ce686 | |||
941261c830 | |||
98c77bf719 | |||
1b9d87fa53 | |||
0e988d7040 | |||
be97d757d9 | |||
19d90fd9bc | |||
5653de1e99 | |||
399bfb9ab6 | |||
234b82b459 | |||
c9e0bcbbfe | |||
47e4976f54 | |||
dd33ea5b8f | |||
689df4ec23 | |||
223fb9aaf3 | |||
bed27a1e58 | |||
40eff91684 |
5
debian/changelog
vendored
5
debian/changelog
vendored
@ -1,5 +0,0 @@
|
|||||||
risotto (0.1) unstable; urgency=low
|
|
||||||
|
|
||||||
* first version
|
|
||||||
|
|
||||||
-- Cadoles <contact@cadoles.com> Fri, 20 Mar 2020 15:18:25 +0100
|
|
14
debian/control
vendored
14
debian/control
vendored
@ -2,13 +2,23 @@ Source: risotto
|
|||||||
Section: admin
|
Section: admin
|
||||||
Priority: extra
|
Priority: extra
|
||||||
Maintainer: Cadoles <contact@cadoles.com>
|
Maintainer: Cadoles <contact@cadoles.com>
|
||||||
Build-depends: debhelper (>=11), python3-all, python3-setuptools
|
Build-depends: debhelper (>=11), python3-all, python3-setuptools, dh-python
|
||||||
Standards-Version: 3.9.4
|
Standards-Version: 3.9.4
|
||||||
Homepage: https://forge.cadoles.com/Infra/risotto
|
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,
|
||||||
|
python3-sdnotify
|
||||||
|
Description: configuration manager libraries
|
||||||
|
|
||||||
Package: risotto
|
Package: risotto
|
||||||
Architecture: any
|
Architecture: any
|
||||||
Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
|
Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
|
||||||
Depends: ${python:Depends}, ${misc:Depends}
|
Depends: ${python:Depends}, ${misc:Depends}, python3-risotto
|
||||||
Description: configuration manager
|
Description: configuration manager
|
||||||
|
|
||||||
|
2
debian/risotto.install
vendored
Normal file
2
debian/risotto.install
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
script/risotto-server usr/bin/
|
||||||
|
sql/risotto.sql usr/share/eole/db/eole-risotto/gen/
|
0
script/risotto-server
Normal file → Executable file
0
script/risotto-server
Normal file → Executable file
@ -65,18 +65,6 @@ if 'CELERYRISOTTO_DB_USER' in environ:
|
|||||||
CELERYRISOTTO_DB_USER = environ['CELERYRISOTTO_DB_USER']
|
CELERYRISOTTO_DB_USER = environ['CELERYRISOTTO_DB_USER']
|
||||||
else:
|
else:
|
||||||
CELERYRISOTTO_DB_USER = config.get('CELERYRISOTTO_DB_USER', None)
|
CELERYRISOTTO_DB_USER = config.get('CELERYRISOTTO_DB_USER', None)
|
||||||
if 'LEMUR_DB_NAME' in environ:
|
|
||||||
LEMUR_DB_NAME = environ['LEMUR_DB_NAME']
|
|
||||||
else:
|
|
||||||
LEMUR_DB_NAME = config.get('LEMUR_DB_NAME', None)
|
|
||||||
if 'LEMUR_DB_PASSWORD' in environ:
|
|
||||||
LEMUR_DB_PASSWORD = environ['LEMUR_DB_PASSWORD']
|
|
||||||
else:
|
|
||||||
LEMUR_DB_PASSWORD = config.get('LEMUR_DB_PASSWORD', None)
|
|
||||||
if 'LEMUR_DB_USER' in environ:
|
|
||||||
LEMUR_DB_USER = environ['LEMUR_DB_USER']
|
|
||||||
else:
|
|
||||||
LEMUR_DB_USER = config.get('LEMUR_DB_USER', None)
|
|
||||||
if 'DB_ADDRESS' in environ:
|
if 'DB_ADDRESS' in environ:
|
||||||
DB_ADDRESS = environ['DB_ADDRESS']
|
DB_ADDRESS = environ['DB_ADDRESS']
|
||||||
else:
|
else:
|
||||||
@ -113,12 +101,12 @@ if 'PASSWORD_ADMIN_EMAIL' in environ:
|
|||||||
PASSWORD_ADMIN_EMAIL = environ['PASSWORD_ADMIN_EMAIL']
|
PASSWORD_ADMIN_EMAIL = environ['PASSWORD_ADMIN_EMAIL']
|
||||||
else:
|
else:
|
||||||
# this parameter is mandatory
|
# this parameter is mandatory
|
||||||
PASSWORD_ADMIN_EMAIL = config.get('PASSWORD_ADMIN_EMAIL', 'XXX')
|
PASSWORD_ADMIN_EMAIL = config['PASSWORD_ADMIN_EMAIL']
|
||||||
if 'PASSWORD_ADMIN_PASSWORD' in environ:
|
if 'PASSWORD_ADMIN_PASSWORD' in environ:
|
||||||
PASSWORD_ADMIN_PASSWORD = environ['PASSWORD_ADMIN_PASSWORD']
|
PASSWORD_ADMIN_PASSWORD = environ['PASSWORD_ADMIN_PASSWORD']
|
||||||
else:
|
else:
|
||||||
# this parameter is mandatory
|
# this parameter is mandatory
|
||||||
PASSWORD_ADMIN_PASSWORD = config.get('PASSWORD_ADMIN_PASSWORD', 'XXX')
|
PASSWORD_ADMIN_PASSWORD = config['PASSWORD_ADMIN_PASSWORD']
|
||||||
if 'PASSWORD_DEVICE_IDENTIFIER' in environ:
|
if 'PASSWORD_DEVICE_IDENTIFIER' in environ:
|
||||||
PASSWORD_DEVICE_IDENTIFIER = environ['PASSWORD_DEVICE_IDENTIFIER']
|
PASSWORD_DEVICE_IDENTIFIER = environ['PASSWORD_DEVICE_IDENTIFIER']
|
||||||
else:
|
else:
|
||||||
@ -135,11 +123,11 @@ else:
|
|||||||
if 'PKI_ADMIN_PASSWORD' in environ:
|
if 'PKI_ADMIN_PASSWORD' in environ:
|
||||||
PKI_ADMIN_PASSWORD = environ['PKI_ADMIN_PASSWORD']
|
PKI_ADMIN_PASSWORD = environ['PKI_ADMIN_PASSWORD']
|
||||||
else:
|
else:
|
||||||
PKI_ADMIN_PASSWORD = config.get('PKI_ADMIN_PASSWORD', 'XXX')
|
PKI_ADMIN_PASSWORD = config['PKI_ADMIN_PASSWORD']
|
||||||
if 'PKI_ADMIN_EMAIL' in environ:
|
if 'PKI_ADMIN_EMAIL' in environ:
|
||||||
PKI_ADMIN_EMAIL = environ['PKI_ADMIN_EMAIL']
|
PKI_ADMIN_EMAIL = environ['PKI_ADMIN_EMAIL']
|
||||||
else:
|
else:
|
||||||
PKI_ADMIN_EMAIL = config.get('PKI_ADMIN_EMAIL', 'XXX')
|
PKI_ADMIN_EMAIL = config['PKI_ADMIN_EMAIL']
|
||||||
if 'PKI_URL' in environ:
|
if 'PKI_URL' in environ:
|
||||||
PKI_URL = environ['PKI_URL']
|
PKI_URL = environ['PKI_URL']
|
||||||
else:
|
else:
|
||||||
@ -153,8 +141,7 @@ def dsn_factory(database, user, password, address=DB_ADDRESS):
|
|||||||
|
|
||||||
_config = {'database': {'dsn': dsn_factory(RISOTTO_DB_NAME, RISOTTO_DB_USER, RISOTTO_DB_PASSWORD),
|
_config = {'database': {'dsn': dsn_factory(RISOTTO_DB_NAME, RISOTTO_DB_USER, RISOTTO_DB_PASSWORD),
|
||||||
'tiramisu_dsn': dsn_factory(TIRAMISU_DB_NAME, TIRAMISU_DB_USER, TIRAMISU_DB_PASSWORD),
|
'tiramisu_dsn': dsn_factory(TIRAMISU_DB_NAME, TIRAMISU_DB_USER, TIRAMISU_DB_PASSWORD),
|
||||||
'celery_dsn': dsn_factory(CELERYRISOTTO_DB_NAME, CELERYRISOTTO_DB_USER, CELERYRISOTTO_DB_PASSWORD),
|
'celery_dsn': dsn_factory(CELERYRISOTTO_DB_NAME, CELERYRISOTTO_DB_USER, CELERYRISOTTO_DB_PASSWORD)
|
||||||
'lemur_dns': dsn_factory(LEMUR_DB_NAME, LEMUR_DB_USER, LEMUR_DB_PASSWORD),
|
|
||||||
},
|
},
|
||||||
'http_server': {'port': RISOTTO_PORT,
|
'http_server': {'port': RISOTTO_PORT,
|
||||||
'default_user': DEFAULT_USER,
|
'default_user': DEFAULT_USER,
|
||||||
|
@ -12,7 +12,7 @@ except:
|
|||||||
from .config import get_config
|
from .config import get_config
|
||||||
from .utils import _, tiramisu_display_name
|
from .utils import _, tiramisu_display_name
|
||||||
from .logger import log
|
from .logger import log
|
||||||
from .dispatcher import get_dispatcher
|
from .dispatcher import dispatcher
|
||||||
from .context import Context
|
from .context import Context
|
||||||
|
|
||||||
|
|
||||||
@ -25,7 +25,7 @@ class Controller:
|
|||||||
def __init__(self,
|
def __init__(self,
|
||||||
test: bool,
|
test: bool,
|
||||||
) -> None:
|
) -> None:
|
||||||
self.dispatcher = get_dispatcher()
|
pass
|
||||||
|
|
||||||
async def call(self,
|
async def call(self,
|
||||||
uri: str,
|
uri: str,
|
||||||
@ -42,11 +42,11 @@ class Controller:
|
|||||||
module = message.split('.', 1)[0]
|
module = message.split('.', 1)[0]
|
||||||
if current_module != module:
|
if current_module != module:
|
||||||
raise ValueError(_(f'cannot call to external module ("{module}") to the URI "{uri}" from "{current_module}"'))
|
raise ValueError(_(f'cannot call to external module ("{module}") to the URI "{uri}" from "{current_module}"'))
|
||||||
return await self.dispatcher.call(version,
|
return await dispatcher.call(version,
|
||||||
message,
|
message,
|
||||||
risotto_context,
|
risotto_context,
|
||||||
**kwargs,
|
**kwargs,
|
||||||
)
|
)
|
||||||
|
|
||||||
async def publish(self,
|
async def publish(self,
|
||||||
uri: str,
|
uri: str,
|
||||||
@ -58,19 +58,20 @@ class Controller:
|
|||||||
if args:
|
if args:
|
||||||
raise ValueError(_(f'the URI "{uri}" can only be published with keyword arguments'))
|
raise ValueError(_(f'the URI "{uri}" can only be published with keyword arguments'))
|
||||||
version, message = uri.split('.', 1)
|
version, message = uri.split('.', 1)
|
||||||
await self.dispatcher.publish(version,
|
await dispatcher.publish(version,
|
||||||
message,
|
message,
|
||||||
risotto_context,
|
risotto_context,
|
||||||
**kwargs,
|
**kwargs,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
async def check_role(self,
|
async def check_role(self,
|
||||||
uri: str,
|
uri: str,
|
||||||
username: str,
|
username: str,
|
||||||
**kwargs: dict,
|
**kwargs: dict,
|
||||||
) -> None:
|
) -> None:
|
||||||
# create a new config
|
# create a new config
|
||||||
async with await Config(self.dispatcher.option) as config:
|
async with await Config(dispatcher.option) as config:
|
||||||
await config.property.read_write()
|
await config.property.read_write()
|
||||||
await config.option('message').value.set(uri)
|
await config.option('message').value.set(uri)
|
||||||
subconfig = config.option(uri)
|
subconfig = config.option(uri)
|
||||||
@ -83,10 +84,10 @@ class Controller:
|
|||||||
raise ValueError(_(f'unknown parameter in "{uri}": "{key}"'))
|
raise ValueError(_(f'unknown parameter in "{uri}": "{key}"'))
|
||||||
except ValueOptionError as err:
|
except ValueOptionError as err:
|
||||||
raise ValueError(_(f'invalid parameter in "{uri}": {err}'))
|
raise ValueError(_(f'invalid parameter in "{uri}": {err}'))
|
||||||
await self.dispatcher.check_role(subconfig,
|
await dispatcher.check_role(subconfig,
|
||||||
username,
|
username,
|
||||||
uri,
|
uri,
|
||||||
)
|
)
|
||||||
|
|
||||||
async def on_join(self,
|
async def on_join(self,
|
||||||
risotto_context,
|
risotto_context,
|
||||||
@ -98,23 +99,20 @@ class TiramisuController(Controller):
|
|||||||
def __init__(self,
|
def __init__(self,
|
||||||
test: bool,
|
test: bool,
|
||||||
) -> None:
|
) -> None:
|
||||||
self.source_imported = None
|
|
||||||
if not 'dataset_name' in vars(self):
|
if not 'dataset_name' in vars(self):
|
||||||
raise Exception(f'please specify "dataset_name" to "{self.__class__.__name__}"')
|
raise Exception(f'please specify "dataset_name" to "{self.__class__.__name__}"')
|
||||||
self.tiramisu_cache_root_path = join(get_config()['cache']['root_path'], self.dataset_name)
|
self.tiramisu_cache_root_path = join(get_config()['cache']['root_path'], self.dataset_name)
|
||||||
super().__init__(test)
|
|
||||||
self.internal_source_name = get_config()['servermodel']['internal_source']
|
|
||||||
if not test:
|
if not test:
|
||||||
db_conf = get_config()['database']['tiramisu_dsn']
|
db_conf = get_config()['database']['tiramisu_dsn']
|
||||||
self.save_storage = Storage(engine='postgres')
|
self.save_storage = Storage(engine='postgres')
|
||||||
self.save_storage.setting(dsn=db_conf)
|
self.save_storage.setting(dsn=db_conf)
|
||||||
if self.dataset_name != 'servermodel':
|
if self.dataset_name != 'servermodel':
|
||||||
self.optiondescription = None
|
self.optiondescription = None
|
||||||
self.dispatcher.set_function('v1.setting.dataset.updated',
|
dispatcher.set_function('v1.setting.dataset.updated',
|
||||||
None,
|
None,
|
||||||
TiramisuController.dataset_updated,
|
TiramisuController.dataset_updated,
|
||||||
self.__class__.__module__,
|
self.__class__.__module__,
|
||||||
)
|
)
|
||||||
|
|
||||||
async def on_join(self,
|
async def on_join(self,
|
||||||
risotto_context: Context,
|
risotto_context: Context,
|
||||||
@ -132,12 +130,6 @@ class TiramisuController(Controller):
|
|||||||
risotto_context: Context,
|
risotto_context: Context,
|
||||||
) -> None:
|
) -> None:
|
||||||
sources = await self.get_sources(risotto_context)
|
sources = await self.get_sources(risotto_context)
|
||||||
source_imported = sources != [self.internal_source_name]
|
|
||||||
if source_imported and self.source_imported is False:
|
|
||||||
await self.load_datas(risotto_context)
|
|
||||||
self.source_imported = source_imported
|
|
||||||
if not self.source_imported:
|
|
||||||
return
|
|
||||||
self._aggregate_tiramisu_funcs(sources)
|
self._aggregate_tiramisu_funcs(sources)
|
||||||
self._convert_dictionaries_to_tiramisu(sources)
|
self._convert_dictionaries_to_tiramisu(sources)
|
||||||
|
|
||||||
@ -183,9 +175,7 @@ except:
|
|||||||
funcs.write(fh.read())
|
funcs.write(fh.read())
|
||||||
funcs.write(b'\n')
|
funcs.write(b'\n')
|
||||||
|
|
||||||
def _convert_dictionaries_to_tiramisu(self,
|
def _convert_dictionaries_to_tiramisu(self, sources: list) -> None:
|
||||||
sources: list,
|
|
||||||
) -> None:
|
|
||||||
funcs_file = join(self.tiramisu_cache_root_path, 'funcs.py')
|
funcs_file = join(self.tiramisu_cache_root_path, 'funcs.py')
|
||||||
tiramisu_file = join(self.tiramisu_cache_root_path, 'tiramisu.py')
|
tiramisu_file = join(self.tiramisu_cache_root_path, 'tiramisu.py')
|
||||||
dictionaries_dir = join(self.tiramisu_cache_root_path, 'dictionaries')
|
dictionaries_dir = join(self.tiramisu_cache_root_path, 'dictionaries')
|
||||||
|
@ -18,9 +18,6 @@ from .context import Context
|
|||||||
from . import register
|
from . import register
|
||||||
|
|
||||||
|
|
||||||
DISPATCHER = None
|
|
||||||
|
|
||||||
|
|
||||||
class CallDispatcher:
|
class CallDispatcher:
|
||||||
async def valid_call_returns(self,
|
async def valid_call_returns(self,
|
||||||
risotto_context: Context,
|
risotto_context: Context,
|
||||||
@ -478,8 +475,6 @@ class Dispatcher(register.RegisterDispatcher,
|
|||||||
)
|
)
|
||||||
# notification
|
# notification
|
||||||
if function_obj.get('notification'):
|
if function_obj.get('notification'):
|
||||||
if returns is None:
|
|
||||||
raise Exception(_(f'function "{function_obj["full_module_name"]}.{function_obj["function"].__name__}" must returns something for {function_obj["notification"]}!'))
|
|
||||||
notif_version, notif_message = function_obj['notification'].split('.', 1)
|
notif_version, notif_message = function_obj['notification'].split('.', 1)
|
||||||
if not isinstance(returns, list):
|
if not isinstance(returns, list):
|
||||||
send_returns = [returns]
|
send_returns = [returns]
|
||||||
@ -495,9 +490,5 @@ class Dispatcher(register.RegisterDispatcher,
|
|||||||
return returns
|
return returns
|
||||||
|
|
||||||
|
|
||||||
def get_dispatcher():
|
dispatcher = Dispatcher()
|
||||||
global DISPATCHER
|
register.dispatcher = dispatcher
|
||||||
if DISPATCHER is None:
|
|
||||||
DISPATCHER = Dispatcher()
|
|
||||||
register.dispatcher = DISPATCHER
|
|
||||||
return DISPATCHER
|
|
||||||
|
@ -7,7 +7,7 @@ except:
|
|||||||
from tiramisu import Config, default_storage
|
from tiramisu import Config, default_storage
|
||||||
|
|
||||||
|
|
||||||
from .dispatcher import get_dispatcher
|
from .dispatcher import dispatcher
|
||||||
from .utils import _
|
from .utils import _
|
||||||
from .context import Context
|
from .context import Context
|
||||||
from .error import CallError, NotAllowedError, RegistrationError
|
from .error import CallError, NotAllowedError, RegistrationError
|
||||||
@ -23,13 +23,9 @@ extra_statics = {}
|
|||||||
|
|
||||||
def create_context(request):
|
def create_context(request):
|
||||||
risotto_context = Context()
|
risotto_context = Context()
|
||||||
if 'username' in dict(request.match_info):
|
risotto_context.username = request.match_info.get('username',
|
||||||
username = request.match_info['username']
|
get_config()['http_server']['default_user'],
|
||||||
elif 'username' in request.headers:
|
)
|
||||||
username = request.headers['username']
|
|
||||||
else:
|
|
||||||
username = get_config()['http_server']['default_user']
|
|
||||||
risotto_context.username = username
|
|
||||||
return risotto_context
|
return risotto_context
|
||||||
|
|
||||||
|
|
||||||
@ -70,7 +66,6 @@ class extra_route_handler:
|
|||||||
if function_name != 'risotto.http':
|
if function_name != 'risotto.http':
|
||||||
risotto_module_name, submodule_name = function_name.split('.', 2)[:-1]
|
risotto_module_name, submodule_name = function_name.split('.', 2)[:-1]
|
||||||
module_name = risotto_module_name.split('_')[-1]
|
module_name = risotto_module_name.split('_')[-1]
|
||||||
dispatcher = get_dispatcher()
|
|
||||||
kwargs['self'] = dispatcher.injected_self[module_name + '.' + submodule_name]
|
kwargs['self'] = dispatcher.injected_self[module_name + '.' + submodule_name]
|
||||||
try:
|
try:
|
||||||
returns = await cls.function(**kwargs)
|
returns = await cls.function(**kwargs)
|
||||||
@ -94,7 +89,6 @@ async def handle(request):
|
|||||||
risotto_context = create_context(request)
|
risotto_context = create_context(request)
|
||||||
kwargs = await request.json()
|
kwargs = await request.json()
|
||||||
try:
|
try:
|
||||||
dispatcher = get_dispatcher()
|
|
||||||
pattern = dispatcher.messages[version][message]['pattern']
|
pattern = dispatcher.messages[version][message]['pattern']
|
||||||
if pattern == 'rpc':
|
if pattern == 'rpc':
|
||||||
method = dispatcher.call
|
method = dispatcher.call
|
||||||
@ -144,7 +138,6 @@ async def api(request,
|
|||||||
# check all URI that have an associated role
|
# check all URI that have an associated role
|
||||||
# all URI without role is concidered has a private URI
|
# all URI without role is concidered has a private URI
|
||||||
uris = []
|
uris = []
|
||||||
dispatcher = get_dispatcher()
|
|
||||||
async with dispatcher.pool.acquire() as connection:
|
async with dispatcher.pool.acquire() as connection:
|
||||||
async with connection.transaction():
|
async with connection.transaction():
|
||||||
# Check role with ACL
|
# Check role with ACL
|
||||||
@ -170,7 +163,6 @@ async def get_app(loop):
|
|||||||
""" build all routes
|
""" build all routes
|
||||||
"""
|
"""
|
||||||
global extra_routes, extra_statics
|
global extra_routes, extra_statics
|
||||||
dispatcher = get_dispatcher()
|
|
||||||
services.link_to_dispatcher(dispatcher)
|
services.link_to_dispatcher(dispatcher)
|
||||||
app = Application(loop=loop)
|
app = Application(loop=loop)
|
||||||
routes = []
|
routes = []
|
||||||
|
@ -1,378 +0,0 @@
|
|||||||
from os import listdir, walk, makedirs
|
|
||||||
from os.path import isfile, isdir, join, dirname
|
|
||||||
from yaml import load, SafeLoader
|
|
||||||
from json import load as jload, dump as jdump
|
|
||||||
from time import time
|
|
||||||
from shutil import copy2, rmtree, move
|
|
||||||
from hashlib import sha512
|
|
||||||
from subprocess import Popen
|
|
||||||
|
|
||||||
from rougail import RougailConvert, RougailConfig, RougailUpgrade
|
|
||||||
try:
|
|
||||||
from tiramisu3 import Config
|
|
||||||
except:
|
|
||||||
from tiramisu import Config
|
|
||||||
|
|
||||||
from .utils import _
|
|
||||||
|
|
||||||
|
|
||||||
DATASET_PATH = '/usr/share/risotto/'
|
|
||||||
TMP_DIRECTORY = '/tmp'
|
|
||||||
PACKER_TMP_DIRECTORY = join(TMP_DIRECTORY, 'packer')
|
|
||||||
PACKER_FILE_NAME = 'recipe.json'
|
|
||||||
IMAGES_DIRECTORY = join(TMP_DIRECTORY, 'images')
|
|
||||||
|
|
||||||
|
|
||||||
FUNCTIONS = b"""try:
|
|
||||||
from tiramisu3 import valid_network_netmask, valid_ip_netmask, valid_broadcast, valid_in_network, valid_not_equal as valid_differ, valid_not_equal, calc_value
|
|
||||||
except:
|
|
||||||
from tiramisu import valid_network_netmask, valid_ip_netmask, valid_broadcast, valid_in_network, valid_not_equal as valid_differ, valid_not_equal, calc_value
|
|
||||||
# =============================================================
|
|
||||||
# fork of risotto-setting/src/risotto_setting/config/config.py
|
|
||||||
def get_password(**kwargs):
|
|
||||||
return 'password'
|
|
||||||
|
|
||||||
|
|
||||||
def get_ip(**kwargs):
|
|
||||||
return '1.1.1.1'
|
|
||||||
|
|
||||||
|
|
||||||
def get_chain(**kwargs):
|
|
||||||
return 'chain'
|
|
||||||
|
|
||||||
|
|
||||||
def get_certificates(**kwargs):
|
|
||||||
return []
|
|
||||||
|
|
||||||
|
|
||||||
def get_certificate(**kwargs):
|
|
||||||
return 'certificate'
|
|
||||||
|
|
||||||
|
|
||||||
def get_private_key(**kwargs):
|
|
||||||
return 'private_key'
|
|
||||||
|
|
||||||
|
|
||||||
def get_linked_configuration(**kwargs):
|
|
||||||
if 'test' in kwargs and kwargs['test']:
|
|
||||||
return kwargs['test'][0]
|
|
||||||
return 'configuration'
|
|
||||||
|
|
||||||
|
|
||||||
def zone_information(**kwargs):
|
|
||||||
return 'zone'
|
|
||||||
# =============================================================
|
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
||||||
|
|
||||||
class Images:
|
|
||||||
def __init__(self,
|
|
||||||
image_dir: str=None,
|
|
||||||
tmp_dir: str=None,
|
|
||||||
):
|
|
||||||
if image_dir is None:
|
|
||||||
image_dir = IMAGES_DIRECTORY
|
|
||||||
self.image_dir = image_dir
|
|
||||||
if isdir(self.image_dir):
|
|
||||||
rmtree(self.image_dir)
|
|
||||||
if tmp_dir is None:
|
|
||||||
tmp_dir = PACKER_TMP_DIRECTORY
|
|
||||||
self.tmp_dir = tmp_dir
|
|
||||||
self.load_applications()
|
|
||||||
|
|
||||||
def load_applications(self) -> None:
|
|
||||||
self.build_images = []
|
|
||||||
self.applications = {}
|
|
||||||
for distrib in listdir(join(DATASET_PATH, 'seed')):
|
|
||||||
distrib_dir = join(DATASET_PATH, 'seed', distrib, 'applicationservice')
|
|
||||||
if not isdir(distrib_dir):
|
|
||||||
continue
|
|
||||||
for release in listdir(distrib_dir):
|
|
||||||
release_dir = join(distrib_dir, release)
|
|
||||||
if not isdir(release_dir):
|
|
||||||
continue
|
|
||||||
for applicationservice in listdir(release_dir):
|
|
||||||
applicationservice_dir = join(release_dir, applicationservice)
|
|
||||||
if not isdir(applicationservice_dir):
|
|
||||||
continue
|
|
||||||
if applicationservice in self.applications:
|
|
||||||
raise Exception('multi applicationservice')
|
|
||||||
with open(join(applicationservice_dir, 'applicationservice.yml')) as yaml:
|
|
||||||
app = load(yaml, Loader=SafeLoader)
|
|
||||||
self.applications[applicationservice] = {'path': applicationservice_dir,
|
|
||||||
'yml': app,
|
|
||||||
}
|
|
||||||
if 'service' in app and app['service']:
|
|
||||||
self.build_images.append(applicationservice)
|
|
||||||
|
|
||||||
def calc_depends(self,
|
|
||||||
dependencies: list,
|
|
||||||
appname,
|
|
||||||
key_is_name=False,
|
|
||||||
):
|
|
||||||
app = self.applications[appname]['yml']
|
|
||||||
if not 'depends' in app or not app['depends']:
|
|
||||||
return
|
|
||||||
for dependency in app['depends']:
|
|
||||||
if key_is_name:
|
|
||||||
key = appname
|
|
||||||
else:
|
|
||||||
key = self.applications[dependency]['path']
|
|
||||||
if key not in dependencies:
|
|
||||||
dependencies.insert(0, key)
|
|
||||||
self.calc_depends(dependencies, dependency, key_is_name)
|
|
||||||
|
|
||||||
def list_oses(self):
|
|
||||||
oses = set()
|
|
||||||
for build in self.build_images:
|
|
||||||
dependencies = [build]
|
|
||||||
self.calc_depends(dependencies, build, True)
|
|
||||||
for dependency in dependencies:
|
|
||||||
if isdir(join(self.applications[dependency]['path'], 'packer', 'os')):
|
|
||||||
oses.add(dependency)
|
|
||||||
break
|
|
||||||
for os in oses:
|
|
||||||
dependencies = [self.applications[os]['path']]
|
|
||||||
self.calc_depends(dependencies, os)
|
|
||||||
yield os, dependencies
|
|
||||||
|
|
||||||
def list_images(self):
|
|
||||||
for build in self.build_images:
|
|
||||||
dependencies = [self.applications[build]['path']]
|
|
||||||
self.calc_depends(dependencies, build)
|
|
||||||
yield build, dependencies
|
|
||||||
|
|
||||||
async def build(self) -> None:
|
|
||||||
if isdir(self.tmp_dir):
|
|
||||||
rmtree(self.tmp_dir)
|
|
||||||
image = Image(self.image_dir,
|
|
||||||
self.tmp_dir,
|
|
||||||
)
|
|
||||||
print(_('Build OSes'))
|
|
||||||
if not isdir(join(self.image_dir, 'os')):
|
|
||||||
makedirs(join(self.image_dir, 'os'))
|
|
||||||
for application, dependencies_path in self.list_oses():
|
|
||||||
print(_(f'Build OS {application}'))
|
|
||||||
await image.build_os(application,
|
|
||||||
dependencies_path,
|
|
||||||
)
|
|
||||||
print(_('Build images'))
|
|
||||||
for application, dependencies_path in self.list_images():
|
|
||||||
print(_(f'Build image {application}'))
|
|
||||||
await image.build_image(application,
|
|
||||||
dependencies_path,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class Image:
|
|
||||||
def __init__(self,
|
|
||||||
image_dir: str,
|
|
||||||
tmp_dir: str,
|
|
||||||
):
|
|
||||||
self.image_dir = image_dir
|
|
||||||
self.tmp_dir = tmp_dir
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def copy_files(dependencies_path: list,
|
|
||||||
dst_path: str,
|
|
||||||
element: str,
|
|
||||||
) -> None:
|
|
||||||
for dependency_path in dependencies_path:
|
|
||||||
src_path = join(dependency_path,
|
|
||||||
'packer',
|
|
||||||
element,
|
|
||||||
)
|
|
||||||
root_len = len(src_path) + 1
|
|
||||||
for dir_name, subdir_names, filenames in walk(src_path):
|
|
||||||
subdir = join(dst_path, dir_name[root_len:])
|
|
||||||
if not isdir(subdir):
|
|
||||||
makedirs(subdir)
|
|
||||||
for filename in filenames:
|
|
||||||
path = join(dir_name, filename)
|
|
||||||
sub_dst_path = join(subdir, filename)
|
|
||||||
if isfile(sub_dst_path):
|
|
||||||
raise Exception(_(f'Try to copy {sub_dst_path} which is already exists'))
|
|
||||||
copy2(path, sub_dst_path)
|
|
||||||
|
|
||||||
async def load_configuration(self,
|
|
||||||
dependencies_path: list,
|
|
||||||
packer_tmp_directory: str,
|
|
||||||
) -> dict:
|
|
||||||
config = RougailConfig.copy()
|
|
||||||
dictionaries = [join(dependency_path, 'dictionaries') for dependency_path in dependencies_path if isdir(join(dependency_path, 'dictionaries'))]
|
|
||||||
upgrade = RougailUpgrade()
|
|
||||||
dest_dictionaries = join(packer_tmp_directory, 'dictionaries')
|
|
||||||
makedirs(dest_dictionaries)
|
|
||||||
dest_dictionaries_extras = join(packer_tmp_directory, 'dictionaries_extras')
|
|
||||||
makedirs(dest_dictionaries_extras)
|
|
||||||
for dependency_path in dependencies_path:
|
|
||||||
dictionaries_dir = join(dependency_path, 'dictionaries')
|
|
||||||
if isdir(dictionaries_dir):
|
|
||||||
upgrade.load_xml_from_folders(dictionaries_dir,
|
|
||||||
dest_dictionaries,
|
|
||||||
RougailConfig['variable_namespace'],
|
|
||||||
)
|
|
||||||
extra_dir = join(dependency_path, 'extras', 'packer')
|
|
||||||
if isdir(extra_dir):
|
|
||||||
upgrade.load_xml_from_folders(extra_dir,
|
|
||||||
dest_dictionaries_extras,
|
|
||||||
'packer',
|
|
||||||
)
|
|
||||||
config['dictionaries_dir'] = [dest_dictionaries]
|
|
||||||
config['extra_dictionaries'] = {'packer': [dest_dictionaries_extras]}
|
|
||||||
self.merge_funcs(config, dependencies_path, packer_tmp_directory)
|
|
||||||
packer_configuration = await self.get_packer_information(config, packer_tmp_directory)
|
|
||||||
return packer_configuration
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def merge_funcs(config: RougailConfig,
|
|
||||||
dependencies_path: list,
|
|
||||||
packer_tmp_directory: str,
|
|
||||||
):
|
|
||||||
functions = FUNCTIONS
|
|
||||||
for dependency_path in dependencies_path:
|
|
||||||
funcs_dir = join(dependency_path, 'funcs')
|
|
||||||
if not isdir(funcs_dir):
|
|
||||||
continue
|
|
||||||
for func in listdir(funcs_dir):
|
|
||||||
with open(join(funcs_dir, func), 'rb') as fh:
|
|
||||||
functions += fh.read()
|
|
||||||
func_name = join(packer_tmp_directory, 'func.py')
|
|
||||||
with open(func_name, 'wb') as fh:
|
|
||||||
fh.write(functions)
|
|
||||||
config['functions_file'] = func_name
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
async def get_packer_information(config: RougailConfig,
|
|
||||||
packer_tmp_directory: str,
|
|
||||||
) -> dict:
|
|
||||||
eolobj = RougailConvert(config)
|
|
||||||
xml = eolobj.save(join(packer_tmp_directory, 'tiramisu.py'))
|
|
||||||
optiondescription = {}
|
|
||||||
exec(xml, None, optiondescription)
|
|
||||||
config = await Config(optiondescription['option_0'])
|
|
||||||
return await config.option('packer').value.dict(leader_to_list=True, flatten=True)
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def do_recipe_checksum(path: str,
|
|
||||||
) -> str:
|
|
||||||
files = []
|
|
||||||
root_len = len(path) + 1
|
|
||||||
for dir_name, subdir_names, filenames in walk(path):
|
|
||||||
subpath = dir_name[root_len:]
|
|
||||||
for filename in filenames:
|
|
||||||
with open(join(dir_name, filename), 'rb') as fh:
|
|
||||||
ctl_sum = sha512(fh.read()).hexdigest()
|
|
||||||
abs_path = join(subpath, filename)
|
|
||||||
files.append(f'{abs_path}/{ctl_sum}')
|
|
||||||
files.sort()
|
|
||||||
print(files, sha512('\n'.join(files).encode()).hexdigest())
|
|
||||||
return sha512('\n'.join(files).encode()).hexdigest()
|
|
||||||
|
|
||||||
def get_tmp_directory(self,
|
|
||||||
application: str,
|
|
||||||
) -> str:
|
|
||||||
return join(self.tmp_dir,
|
|
||||||
application + '_' + str(time()),
|
|
||||||
)
|
|
||||||
|
|
||||||
def get_os_filename(self,
|
|
||||||
packer_configuration: dict,
|
|
||||||
) -> str:
|
|
||||||
return join(self.image_dir,
|
|
||||||
'os',
|
|
||||||
packer_configuration['os_name'] + '_' + packer_configuration['os_version'] + '.img',
|
|
||||||
)
|
|
||||||
|
|
||||||
def get_image_filename(self,
|
|
||||||
recipe_checksum: str,
|
|
||||||
) -> str:
|
|
||||||
return join(self.image_dir,
|
|
||||||
f'{recipe_checksum}.img',
|
|
||||||
)
|
|
||||||
|
|
||||||
async def build_os(self,
|
|
||||||
application: str,
|
|
||||||
dependencies_path: list,
|
|
||||||
) -> None:
|
|
||||||
packer_tmp_directory = self.get_tmp_directory(application)
|
|
||||||
packer_configuration = await self.load_configuration(dependencies_path, packer_tmp_directory)
|
|
||||||
packer_dst_os_filename = self.get_os_filename(packer_configuration)
|
|
||||||
self.copy_files(dependencies_path,
|
|
||||||
packer_tmp_directory,
|
|
||||||
'os',
|
|
||||||
)
|
|
||||||
packer_configuration['tmp_directory'] = packer_tmp_directory
|
|
||||||
recipe = {'variables': packer_configuration}
|
|
||||||
self.build(packer_dst_os_filename,
|
|
||||||
packer_tmp_directory,
|
|
||||||
recipe,
|
|
||||||
)
|
|
||||||
|
|
||||||
async def build_image(self,
|
|
||||||
application: str,
|
|
||||||
dependencies_path: list,
|
|
||||||
) -> None:
|
|
||||||
packer_tmp_directory = self.get_tmp_directory(application)
|
|
||||||
makedirs(packer_tmp_directory)
|
|
||||||
self.copy_files(dependencies_path,
|
|
||||||
packer_tmp_directory,
|
|
||||||
'image',
|
|
||||||
)
|
|
||||||
recipe_checksum = self.do_recipe_checksum(packer_tmp_directory)
|
|
||||||
packer_dst_filename = self.get_image_filename(recipe_checksum)
|
|
||||||
packer_configuration = await self.load_configuration(dependencies_path, packer_tmp_directory)
|
|
||||||
packer_dst_os_filename = join(self.image_dir,
|
|
||||||
'os',
|
|
||||||
packer_configuration['os_name'] + '_' + packer_configuration['os_version'] + '.img',
|
|
||||||
)
|
|
||||||
packer_configuration['tmp_directory'] = packer_tmp_directory
|
|
||||||
recipe = {'variables': packer_configuration}
|
|
||||||
recipe['variables']['iso_url'] = packer_dst_os_filename
|
|
||||||
self.build(packer_dst_filename,
|
|
||||||
packer_tmp_directory,
|
|
||||||
recipe,
|
|
||||||
f'{packer_dst_os_filename}.sha256',
|
|
||||||
)
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def build(packer_dst_filename: str,
|
|
||||||
tmp_directory: str,
|
|
||||||
recipe: dict,
|
|
||||||
sha_file: str=None,
|
|
||||||
) -> None:
|
|
||||||
packer_filename = join(tmp_directory, PACKER_FILE_NAME)
|
|
||||||
if sha_file is not None:
|
|
||||||
with open(sha_file, 'r') as fh:
|
|
||||||
sha256 = fh.read().split(' ', 1)[0]
|
|
||||||
recipe['variables']['iso_checksum'] = sha256
|
|
||||||
with open(packer_filename, 'r') as recipe_fd:
|
|
||||||
for key, value in jload(recipe_fd).items():
|
|
||||||
recipe[key] = value
|
|
||||||
with open(packer_filename, 'w') as recipe_fd:
|
|
||||||
jdump(recipe, recipe_fd, indent=2)
|
|
||||||
preprocessors = join(tmp_directory, 'preprocessors')
|
|
||||||
if isfile(preprocessors):
|
|
||||||
proc = Popen([preprocessors],
|
|
||||||
#stdout=PIPE,
|
|
||||||
#stderr=PIPE,
|
|
||||||
cwd=tmp_directory,
|
|
||||||
)
|
|
||||||
proc.wait()
|
|
||||||
if proc.returncode:
|
|
||||||
raise Exception(_(f'error when executing {preprocessors}'))
|
|
||||||
proc = Popen(['packer', 'build', packer_filename],
|
|
||||||
#stdout=PIPE,
|
|
||||||
#stderr=PIPE,
|
|
||||||
cwd=tmp_directory,
|
|
||||||
)
|
|
||||||
proc.wait()
|
|
||||||
if proc.returncode:
|
|
||||||
raise Exception(_(f'cannot build {packer_dst_filename} with {packer_filename}'))
|
|
||||||
if not isdir(dirname(packer_dst_filename)):
|
|
||||||
makedirs(dirname(packer_dst_filename))
|
|
||||||
move(join(tmp_directory, 'image.img'), packer_dst_filename)
|
|
||||||
move(join(tmp_directory, 'image.sha256'), f'{packer_dst_filename}.sha256')
|
|
||||||
print(_(f'Image {packer_dst_filename} created'))
|
|
||||||
rmtree(tmp_directory)
|
|
@ -192,7 +192,7 @@ class Logger:
|
|||||||
await connection.execute(sql,
|
await connection.execute(sql,
|
||||||
risotto_context.start_id,
|
risotto_context.start_id,
|
||||||
datetime.now(),
|
datetime.now(),
|
||||||
err[:254],
|
err,
|
||||||
LEVELS.index('Failure'),
|
LEVELS.index('Failure'),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -19,8 +19,8 @@ from .utils import _
|
|||||||
|
|
||||||
MESSAGE_ROOT_PATH = get_config()['global']['message_root_path']
|
MESSAGE_ROOT_PATH = get_config()['global']['message_root_path']
|
||||||
groups.addgroup('message')
|
groups.addgroup('message')
|
||||||
CUSTOMTYPES = None
|
MESSAGE_TRANSLATION = translation('risotto-message', join(MESSAGE_ROOT_PATH, '..', 'locale')).gettext
|
||||||
MESSAGE_TRANSLATION = None
|
|
||||||
|
|
||||||
|
|
||||||
class DictOption(Option):
|
class DictOption(Option):
|
||||||
@ -593,11 +593,6 @@ def get_messages(current_module_names,
|
|||||||
):
|
):
|
||||||
"""generate description from yml files
|
"""generate description from yml files
|
||||||
"""
|
"""
|
||||||
global MESSAGE_TRANSLATION, CUSTOMTYPES
|
|
||||||
if MESSAGE_TRANSLATION is None:
|
|
||||||
MESSAGE_TRANSLATION = translation('risotto-message', join(MESSAGE_ROOT_PATH, '..', 'locale')).gettext
|
|
||||||
if CUSTOMTYPES is None:
|
|
||||||
CUSTOMTYPES = load_customtypes()
|
|
||||||
optiondescriptions = {}
|
optiondescriptions = {}
|
||||||
optiondescriptions_info = {}
|
optiondescriptions_info = {}
|
||||||
messages = list(list_messages(uris,
|
messages = list(list_messages(uris,
|
||||||
@ -637,3 +632,6 @@ def get_messages(current_module_names,
|
|||||||
optiondescriptions,
|
optiondescriptions,
|
||||||
)
|
)
|
||||||
return optiondescriptions_info, root
|
return optiondescriptions_info, root
|
||||||
|
|
||||||
|
|
||||||
|
CUSTOMTYPES = load_customtypes()
|
||||||
|
@ -83,16 +83,12 @@ def register(uris: str,
|
|||||||
uris = [uris]
|
uris = [uris]
|
||||||
|
|
||||||
def decorator(function):
|
def decorator(function):
|
||||||
try:
|
for uri in uris:
|
||||||
for uri in uris:
|
dispatcher.set_function(uri,
|
||||||
dispatcher.set_function(uri,
|
notification,
|
||||||
notification,
|
function,
|
||||||
function,
|
function.__module__
|
||||||
function.__module__
|
)
|
||||||
)
|
|
||||||
except NameError:
|
|
||||||
# if you when register uri, please use get_dispatcher before registered uri
|
|
||||||
pass
|
|
||||||
return decorator
|
return decorator
|
||||||
|
|
||||||
|
|
||||||
@ -111,7 +107,6 @@ class RegisterDispatcher:
|
|||||||
version = obj['version']
|
version = obj['version']
|
||||||
if version not in self.messages:
|
if version not in self.messages:
|
||||||
self.messages[version] = {}
|
self.messages[version] = {}
|
||||||
obj['message'] = tiramisu_message
|
|
||||||
self.messages[version][tiramisu_message] = obj
|
self.messages[version][tiramisu_message] = obj
|
||||||
|
|
||||||
def get_function_args(self,
|
def get_function_args(self,
|
||||||
|
Reference in New Issue
Block a user