Bugfixes in LodelSiteDatasource

Now we are able to insert a lodelsite

lodel/plugins/lodelsite_datasource/__init__.py

@@ -14,7 +14,6 @@ from lodel.context import LodelContext
 LodelContext.expose_modules(globals(), {
     'lodel.settings.validator': ['SettingValidator'],
     'lodel.logger': 'logger'})
-from .datasource import DummyDatasource as Datasource
 from .specs import check
 
 __plugin_type__ = 'datasource'

lodel/plugins/lodelsite_datasource/exceptions.py

@@ -1,5 +1,5 @@
 class LodesSiteDatasourceError(Exception):
     pass
 
-class LodelSiteDatasourceInconsistency(LodelSiteDatasourceError):
+class LodelSiteDatasourceInconsistency(LodesSiteDatasourceError):
     pass

lodel/plugins/lodelsite_datasource/fs_utils.py

@@ -7,7 +7,7 @@ import shutil
 from lodel.context import LodelContext
 from lodel import buildconf #No need to protect it in Contexts
 
-LodelContext.expose_module(globals(), {
+LodelContext.expose_modules(globals(), {
     'lodel.plugin.datasource_plugin': ['AbstractDatasource', 'DatasourcePlugin'],
     'lodel.exceptions': ['LodelFatalError'],
     'lodel.settings': 'Settings'})
@@ -16,7 +16,7 @@ from .exceptions import *
 
 LODELSITE_DATAS_PATH = os.path.join(buildconf.LODEL2VARDIR,'sites_datas')
 LODELSITE_CONTEXTS_PATH = os.path.join(
-    buildconf.LODEL2VARDIRE, '.sites_contexts')
+    buildconf.LODEL2VARDIR, '.sites_contexts')
 
 ##@brief Define directories architecture
 #
@@ -46,14 +46,14 @@ def name2paths(name):
 def site_exists(name):
     paths = name2paths(name)
     for path in paths:
-        if os.path.is_file(path):
+        if os.path.isfile(path):
             msg = 'Will trying to determine if a lodesite "%s" exists we \
 found that "%s" is a file, but a directory was expected' % (name, path)
             raise LodelSiteDatasourceInconsistency(msg)
 
     res = [False, False]
-    res = [os.is_dir(paths[0]),
-        os.is_dir(paths[1])]
+    res = [os.path.isdir(paths[0]),
+        os.path.isdir(paths[1])]
     if res[0] != res[1]:
         msg = 'Inconsistency detected on filesystem will trying to determine \
 wether a lodelsite exists or not : '
@@ -81,24 +81,24 @@ allready exists' % name)
     try:
         os.mkdir(data_path)
     except FileExistsError:
-        logger.fatal('This should never append ! We just checked that this \
+        logger.critical('This should never append ! We just checked that this \
 directory do not exists. BAILOUT !')
         raise LodelFatalError('Unable to create data directory for lodelsite \
 "%s", file exists')
     except Exception as e:
-        raise LodelFataError(('Unable to create data directory for lodelsite \
-"%s" : ' % name) + e)
+        raise LodelFatalError('Unable to create data directory for lodelsite \
+"%s" : %s' % (name,e))
     #Context dir
     try:
         os.mkdir(ctx_path)
-    except FileExistsErrpr:
-        logger.fatal('This should never append ! We just checked that this \
+    except FileExistsError:
+        logger.critical('This should never append ! We just checked that this \
 directory do not exists. BAILOUT !')
         raise LodelFatalError('Unable to create context directory for \
 lodelsite "%s", file exists')
     except Exception as e:
-        raise LodelFataError(('Unable to create context directory for \
-lodelsite "%s" : ' % name) + e)
+        raise LodelFatalError('Unable to create context directory for \
+lodelsite "%s" : %s' % (name, e))
     
     #Child directories
     for mname, ccd in (('datas', data_path), ('ctx', ctx_path)):
@@ -108,11 +108,11 @@ lodelsite "%s" : ' % name) + e)
             try:
                 os.mkdir(to_create)
             except FileExistsError:
-                logger.fatal('This should never append ! We just created parent \
+                logger.critical('This should never append ! We just created parent \
 directory. BAILOUT !')
             except Exception as e:
-                raise LodelFatalError(('Unable to create %s directory for \
-lodelsite "%s" : ' % (d,name)) + e)
+                raise LodelFatalError('Unable to create %s directory for \
+lodelsite "%s" : %s' % (d,name, e))
     
 ##@brief Generate conffile containing informations set by lodelsites EM
 #

lodel/plugins/lodelsite_datasource/main.py

@@ -1,7 +1,7 @@
 import os.path
 from lodel.context import LodelContext
 
-LodelContext.expose_module(globals(), {
+LodelContext.expose_modules(globals(), {
     'lodel.plugin.datasource_plugin': ['AbstractDatasource', 'DatasourcePlugin'],
     'lodel.logger': 'logger',
     'lodel.exceptions': ['LodelFatalError'],
@@ -24,7 +24,7 @@ class Datasource(AbstractDatasource):
     #@param db_datasource_ro str : read only datasource identitifer
     def __init__(self, db_datasource, db_datasource_ro = None):
         if db_datasource_ro is None:
-            db_datasource = db_datasource_ro
+            db_datasource_ro = db_datasource
         self._child_ds = DatasourcePlugin.init_datasource(
             db_datasource, False)
         self._child_ds_ro = DatasourcePlugin.init_datasource(
@@ -41,7 +41,7 @@ class Datasource(AbstractDatasource):
         res, reason = check_leo(leo)
         if not res:
             msg = 'Bad leo given : %s because %s' % (leo, reason)
-            logger.fatal(msg)
+            logger.critical(msg)
             raise LodelFatalError(msg)
 
     ##@brief Provide a new uniq numeric ID
@@ -104,15 +104,15 @@ existing site with a new name')
         
         datas = self.select(
             target,
-            ['shortname', 'groups', 'extensions'],
+            ['shortname', 'em_groups', 'extensions'],
             filters,
             relational_filters)
 
         for data in datas:
-            if 'groups' in upd_datas:
-                groups = upd_datas['groups']
+            if 'em_groups' in upd_datas:
+                groups = upd_datas['em_groups']
             else:
-                groups = data['groups']
+                groups = data['em_groups']
             if 'extensions' in upd_datas:
                 extensions = upd_datas['extensions']
             else:
@@ -120,7 +120,7 @@ existing site with a new name')
 
             update_conf(**{
                 'sitename': data['shortname'],
-                'groups': groups,
+                'em_groups': groups,
                 'extensions': extensions})
         
         return self._child_ds.update(
@@ -138,7 +138,7 @@ allready exists' % (new_datas['shortname']))
         site_directories_creation(new_datas['shortname'])
         generate_conf(
             new_datas['shortname'],
-            new_datas['groups'],
+            new_datas['em_groups'],
             new_datas['extensions'])
         return self._child_ds.insert(target, new_datas)
 

lodel/plugins/lodelsite_datasource/specs.py

@@ -4,7 +4,7 @@
 #@note isolated in order to be usable by __init__.py and main.py
 
 LEO_NAME = 'Lodelsite'
-MANDATORY_FIELDNAMES = [ 'shortname', 'extensions', 'groups' ]
+MANDATORY_FIELDNAMES = [ 'shortname', 'extensions', 'em_groups' ]
 
 ##@brief Checks that given emcomponent is compatible with datasource
 #behavior
@@ -12,11 +12,11 @@ MANDATORY_FIELDNAMES = [ 'shortname', 'extensions', 'groups' ]
 #@param emcomp LeObject subclass (or instance)
 #@return a tuple (bool, reason_str)
 def check(leo):
-    if hasattr(leo, '__class__'):
+    if not hasattr(leo, '__name__'):
         leo = leo.__class__
     if leo.__name__ != LEO_NAME:
         return (False, 'bad name')
-    missings = MANDATORY_FIELDNAMES - set(leo.fieldnames())
+    missings = set(MANDATORY_FIELDNAMES) - set(leo.fieldnames())
     if len(missings) > 0:
         return (False, 'missing fields : ' + (', '.join(missings)))
     return (True, 'ok')