contrib: renamed bareos-tasks-plugins -> bareos_tasks

Renamed bareos-tasks-plugins to bareos_tasks.
Adapt file names to PEP8 (lowercase, no - in names).
Adapt bareos_tasks.pssql to Bareos >= 20.

20 files changed, 44 insertions, 38 deletions

diff --git a/contrib/fd-plugins/bareos-tasks-plugins/pgsql/__init__.py b/contrib/fd-plugins/bareos-tasks-plugins/pgsql/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/contrib/fd-plugins/bareos-tasks-plugins/pgsql/__init__.py
+++ /dev/null
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/xenserver/__init__.py b/contrib/fd-plugins/bareos-tasks-plugins/xenserver/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/contrib/fd-plugins/bareos-tasks-plugins/xenserver/__init__.py
+++ /dev/null
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/BareosFdTaskClass.py b/contrib/fd-plugins/bareos_tasks/BareosFdTaskClass.py
index 97913fda7..154e1d0c1 100644
--- a/contrib/fd-plugins/bareos-tasks-plugins/BareosFdTaskClass.py
+++ b/contrib/fd-plugins/bareos_tasks/BareosFdTaskClass.py
@@ -23,8 +23,8 @@ from StringIO import StringIO
 from fcntl import fcntl, F_GETFL, F_SETFL
 from pwd import getpwnam
 
-from bareosfd import JobMessage, DebugMessage, StatPacket, GetValue
-from bareos_fd_consts import bRCs, bIOPS, bJobMessageType, bFileType, bVariable
+#import bareosfd
+from bareosfd import JobMessage, DebugMessage, StatPacket, GetValue, bRCs, bIOPS, bJobMessageType, bFileType, bVariable, M_ERROR, M_INFO
 from BareosFdPluginBaseclass import BareosFdPluginBaseclass
 
 
@@ -237,8 +237,8 @@ class BareosFdTaskClass(BareosFdPluginBaseclass):
     debug_level = 100
     plugin_name = 'unknown'
 
-    def __init__(self, context, plugin_def):
-        BareosFdPluginBaseclass.__init__(self, context, plugin_def)
+    def __init__(self, plugin_def):
+        BareosFdPluginBaseclass.__init__(self, plugin_def)
         self.config = None
         self.folder = None
         self.job_type = None
@@ -246,67 +246,68 @@ class BareosFdTaskClass(BareosFdPluginBaseclass):
         self.tasks = list()
 
     def log_format(self, message):
-        return '{0}: {1}\n'.format(self.plugin_name, message.lower())
+        return '{0}: {1}\n'.format(self.plugin_name, message)
 
-    def job_message(self, context, level, message):
-        self.debug_message(context, message)
-        JobMessage(context, level, self.log_format(message))
+    def job_message(self, level, message):
+        self.debug_message(message)
+        JobMessage(level, self.log_format(message))
 
-    def debug_message(self, context, message):
-        DebugMessage(context, self.debug_level, self.log_format(message))
+    def debug_message(self, message):
+        DebugMessage(self.debug_level, self.log_format(message))
 
     def prepare_tasks(self):
         raise Exception('need to be override')
 
-    def parse_plugin_definition(self, context, plugin_def):
-        BareosFdPluginBaseclass.parse_plugin_definition(self, context, plugin_def)
-        self.job_type = GetValue(context, bVariable['bVarType'])
+    def parse_plugin_definition(self, plugin_def):
+        BareosFdPluginBaseclass.parse_plugin_definition(self, plugin_def)
+        self.job_type = GetValue(bVariable['bVarType'])
         self.config = PluginConfig(**self.options)
         self.folder = self.config.get('folder', '@{0}'.format(self.plugin_name.upper()))
         try:
             self.prepare_tasks()
-        except TaskException, _:
+        except TaskException as e:
+            self.job_message(M_ERROR, str(e))
             return bRCs['bRC_Error']
 
-        self.debug_message(context, '{0} task created'.format(len(self.tasks)))
+        self.debug_message('{0} tasks created'.format(len(self.tasks)))
         return bRCs['bRC_OK']
 
-    def start_backup_file(self, context, save_pkt):
+    def start_backup_file(self, save_pkt):
 
         if not len(self.tasks):
-            self.job_message(context, bJobMessageType['M_WARNING'], 'no tasks defined')
+            self.job_message(bJobMessageType['M_WARNING'], 'no tasks defined')
             return bRCs['bRC_Skip']
 
         self.task = self.tasks.pop()
         stat_pkt = StatPacket()
-        stat_pkt.size = self.task.get_size()
-        stat_pkt.blksize = self.task.get_block_size()
+        stat_pkt.st_size = self.task.get_size()
+        stat_pkt.st_blksize = self.task.get_block_size()
         save_pkt.statp = stat_pkt
-        save_pkt.fname = os.path.join('/', self.folder, self.task.get_filename())
+        save_pkt.fname = os.path.join(self.folder, self.task.get_filename())
         save_pkt.type = bFileType['FT_REG']
 
         return bRCs['bRC_OK']
 
-    def plugin_io(self, context, iop):
+    def plugin_io(self, iop):
         if self.job_type == bJobType['BACKUP']:
 
             if iop.func == bIOPS['IO_OPEN']:
                 try:
-                    self.job_message(context, bJobMessageType['M_INFO'], '{0} started'.format(self.task.get_name()))
+                    self.job_message(bJobMessageType['M_INFO'], '{0} started'.format(self.task.get_name()))
                     self.task.task_pool()
                     self.task.task_open()
                 except TaskException, e:
-                    self.job_message(context, bJobMessageType['M_ERROR'], '{0} {1}'.format(self.task.get_name(), e))
+                    self.job_message(bJobMessageType['M_ERROR'], '{0} {1}'.format(self.task.get_name(), e))
                     return bRCs['bRC_Error']
                 return bRCs['bRC_OK']
 
             elif iop.func == bIOPS['IO_CLOSE']:
                 try:
-                    self.job_message(context, bJobMessageType['M_INFO'], '{0} done'.format(self.task.get_name()))
+                    self.job_message(bJobMessageType['M_INFO'], '{0} done'.format(self.task.get_name()))
                     self.task.task_pool()
                     self.task.task_close()
                 except TaskException, e:
-                    self.job_message(context, bJobMessageType['M_ERROR'], '{0} {1}'.format(self.task.get_name(), e))
+                    self.job_message(bJobMessageType['M_ERROR'], '{0} {1}'.format(self.task.get_name(), e))
                     return bRCs['bRC_Error']
                 return bRCs['bRC_OK']
 
@@ -317,17 +318,17 @@ class BareosFdTaskClass(BareosFdPluginBaseclass):
                     iop.buf = bytearray(iop.count)
                     iop.status = self.task.task_read(iop.buf)
                 except TaskException, e:
-                    self.job_message(context, bJobMessageType['M_ERROR'], '{0} {1}'.format(self.task.get_name(), e))
+                    self.job_message(bJobMessageType['M_ERROR'], '{0} {1}'.format(self.task.get_name(), e))
                     return bRCs['bRC_Error']
                 return bRCs['bRC_OK']
 
-        return BareosFdPluginBaseclass.plugin_io(self, context, iop)
+        return super(BareosFdTaskClass).plugin_io(self, iop)
 
-    def end_backup_file(self, context):
+    def end_backup_file(self):
         result = self.task.task_wait()
 
         if result:
-            self.job_message(context, bJobMessageType['M_ERROR'], '{0} {1}'.format(self.task.get_details(), result))
+            self.job_message(bJobMessageType['M_ERROR'], '{0} {1}'.format(self.task.get_details(), result))
             return bRCs['bRC_Error']
 
         self.tasks.extend(self.task.get_next_tasks())
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/LICENSE.md b/contrib/fd-plugins/bareos_tasks/LICENSE.md
index cba6f6a15..cba6f6a15 100644
--- a/contrib/fd-plugins/bareos-tasks-plugins/LICENSE.md
+++ b/contrib/fd-plugins/bareos_tasks/LICENSE.md
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/README.md b/contrib/fd-plugins/bareos_tasks/README.md
index d498b9333..d498b9333 100644
--- a/contrib/fd-plugins/bareos-tasks-plugins/README.md
+++ b/contrib/fd-plugins/bareos_tasks/README.md
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/mysql/BareosFdMySQLClass.py b/contrib/fd-plugins/bareos_tasks/mysql/BareosFdMySQLClass.py
index 5146a6f16..5146a6f16 100644
--- a/contrib/fd-plugins/bareos-tasks-plugins/mysql/BareosFdMySQLClass.py
+++ b/contrib/fd-plugins/bareos_tasks/mysql/BareosFdMySQLClass.py
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/mysql/README.md b/contrib/fd-plugins/bareos_tasks/mysql/README.md
index 909d384e7..909d384e7 100644
--- a/contrib/fd-plugins/bareos-tasks-plugins/mysql/README.md
+++ b/contrib/fd-plugins/bareos_tasks/mysql/README.md
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/__init__.py b/contrib/fd-plugins/bareos_tasks/mysql/__init__.py
index e69de29bb..e69de29bb 100644
--- a/contrib/fd-plugins/bareos-tasks-plugins/__init__.py
+++ b/contrib/fd-plugins/bareos_tasks/mysql/__init__.py
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/mysql/bareos-fd-mysql.py b/contrib/fd-plugins/bareos_tasks/mysql/bareos-fd-mysql.py
index a493c3b37..a493c3b37 100644
--- a/contrib/fd-plugins/bareos-tasks-plugins/mysql/bareos-fd-mysql.py
+++ b/contrib/fd-plugins/bareos_tasks/mysql/bareos-fd-mysql.py
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/oracle/BareosFdOracleClass.py b/contrib/fd-plugins/bareos_tasks/oracle/BareosFdOracleClass.py
index 9f1a9e9e3..9f1a9e9e3 100644
--- a/contrib/fd-plugins/bareos-tasks-plugins/oracle/BareosFdOracleClass.py
+++ b/contrib/fd-plugins/bareos_tasks/oracle/BareosFdOracleClass.py
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/oracle/README.md b/contrib/fd-plugins/bareos_tasks/oracle/README.md
index f4037ddd8..f4037ddd8 100644
--- a/contrib/fd-plugins/bareos-tasks-plugins/oracle/README.md
+++ b/contrib/fd-plugins/bareos_tasks/oracle/README.md
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/mysql/__init__.py b/contrib/fd-plugins/bareos_tasks/oracle/__init__.py
index e69de29bb..e69de29bb 100644
--- a/contrib/fd-plugins/bareos-tasks-plugins/mysql/__init__.py
+++ b/contrib/fd-plugins/bareos_tasks/oracle/__init__.py
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/oracle/bareos-fd-oracle.py b/contrib/fd-plugins/bareos_tasks/oracle/bareos-fd-oracle.py
index 39d93dd3d..39d93dd3d 100644
--- a/contrib/fd-plugins/bareos-tasks-plugins/oracle/bareos-fd-oracle.py
+++ b/contrib/fd-plugins/bareos_tasks/oracle/bareos-fd-oracle.py
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/pgsql/BareosFdPgSQLClass.py b/contrib/fd-plugins/bareos_tasks/pgsql/BareosFdPgSQLClass.py
index 1cb2f983c..efcdfbdb0 100644
--- a/contrib/fd-plugins/bareos-tasks-plugins/pgsql/BareosFdPgSQLClass.py
+++ b/contrib/fd-plugins/bareos_tasks/pgsql/BareosFdPgSQLClass.py
@@ -19,14 +19,15 @@
 
 import shlex
 
-from BareosFdTaskClass import TaskProcess, BareosFdTaskClass
+import bareosfd
+from bareos_tasks.BareosFdTaskClass import TaskProcess, BareosFdTaskClass
 
 
 class TaskQueryDatabase(TaskProcess):
 
     def __init__(self, psql=None, pg_user=None):
         self.run_as_user = pg_user
-        psql_options = '--expanded --no-align'
+        psql_options = 'postgres --expanded --no-align'
         self.command = [psql if psql else 'psql'] + shlex.split(psql_options)
         super(TaskQueryDatabase, self).__init__()
 
@@ -68,6 +69,10 @@ class TaskDumpDatabase(TaskProcess):
         return '{0}-{1}'.format(self.task_name, self.database)
 
     def get_size(self):
+        # This does not return the size of the dump file, but the current required disk space.
+        # However, as the need the size before the dump command is executed,
+        # this is the best estimation we got.
+        # However, there will be warnings about incorrect sizes on restore.
         return TaskQueryDatabase(self.psql, self.run_as_user).get_database_size(self.database)
 
 
@@ -83,6 +88,7 @@ class BareosFdPgSQLClass(BareosFdTaskClass):
         pg_user = self.options.get('pg_user', 'postgres')
 
         databases = self.config.get_list('databases', TaskQueryDatabase(psql, pg_user).get_databases())
+        self.job_message(bareosfd.M_INFO, "databases: {}".format(databases))
 
         if 'exclude' in self.config:
             exclude = self.config.get_list('exclude')
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/pgsql/README.md b/contrib/fd-plugins/bareos_tasks/pgsql/README.md
index 376ef19fb..96f33795c 100644
--- a/contrib/fd-plugins/bareos-tasks-plugins/pgsql/README.md
+++ b/contrib/fd-plugins/bareos_tasks/pgsql/README.md
@@ -56,7 +56,7 @@ Virtual folder used in catalog. Default: *@PGSQL*
 Command (with or without full path) to *psql* tool. Default: *psql*
 
 #### pg_dump
-Command (with or without full path) to *pg_dup* tool. Default: *pg_dump*
+Command (with or without full path) to *pg_dump* tool. Default: *pg_dump*
 
 #### pg_dump_options
 Options to be used with the *pg_dump* tool. Default: *--no-owner --no-acl*
@@ -68,4 +68,4 @@ Username of the system user running the *psql* and *pg_dump* tools. Default: *po
 Comma separated list of database names to backup, if unset all databases (except 'postgres', 'template1' and 'template0') are dumped. Default: unset
 
 #### exclude
-Comma separated list of database names exclude from backup. Default: unset
\ No newline at end of file
+Comma separated list of database names exclude from backup. Default: unset
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/pgsql/bareos-fd-pgsql.py b/contrib/fd-plugins/bareos_tasks/pgsql/__init__.py
index 92f80fd3a..338ff5bfa 100644
--- a/contrib/fd-plugins/bareos-tasks-plugins/pgsql/bareos-fd-pgsql.py
+++ b/contrib/fd-plugins/bareos_tasks/pgsql/__init__.py
@@ -17,12 +17,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+import bareosfd
 import BareosFdWrapper
-from bareos_fd_consts import bRCs
-from BareosFdWrapper import *
 from BareosFdPgSQLClass import BareosFdPgSQLClass
 
 
-def load_bareos_plugin(context, plugin_def):
-    BareosFdWrapper.bareos_fd_plugin_object = BareosFdPgSQLClass(context, plugin_def)
-    return bRCs['bRC_OK']
+def load_bareos_plugin(plugin_def):
+    BareosFdWrapper.bareos_fd_plugin_object = BareosFdPgSQLClass(plugin_def)
+    bareosfd.bRC_OK
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/xenserver/BareosFdXenServerClass.py b/contrib/fd-plugins/bareos_tasks/xenserver/BareosFdXenServerClass.py
index fd1e64869..fd1e64869 100644
--- a/contrib/fd-plugins/bareos-tasks-plugins/xenserver/BareosFdXenServerClass.py
+++ b/contrib/fd-plugins/bareos_tasks/xenserver/BareosFdXenServerClass.py
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/xenserver/README.md b/contrib/fd-plugins/bareos_tasks/xenserver/README.md
index fb4dbd776..fb4dbd776 100644
--- a/contrib/fd-plugins/bareos-tasks-plugins/xenserver/README.md
+++ b/contrib/fd-plugins/bareos_tasks/xenserver/README.md
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/oracle/__init__.py b/contrib/fd-plugins/bareos_tasks/xenserver/__init__.py
index e69de29bb..e69de29bb 100644
--- a/contrib/fd-plugins/bareos-tasks-plugins/oracle/__init__.py
+++ b/contrib/fd-plugins/bareos_tasks/xenserver/__init__.py
diff --git a/contrib/fd-plugins/bareos-tasks-plugins/xenserver/bareos-fd-xenserver.py b/contrib/fd-plugins/bareos_tasks/xenserver/bareos-fd-xenserver.py
index 8a4d95934..8a4d95934 100644
--- a/contrib/fd-plugins/bareos-tasks-plugins/xenserver/bareos-fd-xenserver.py
+++ b/contrib/fd-plugins/bareos_tasks/xenserver/bareos-fd-xenserver.py