From 41101548689e724338f65de38849b27231350d25 Mon Sep 17 00:00:00 2001 From: Philipp Storz Date: Thu, 9 Jan 2020 16:19:04 +0100 Subject: [PATCH] Percona Xtrabackup Plugin: rename percona_xtrabackup to percona-xtrabackup everywhere --- ...ercona-xtrabackup-python-plugin.install.in | 2 +- core/platforms/packaging/bareos.spec | 22 +++++++++---------- core/src/plugins/filed/CMakeLists.txt | 2 +- ...kup.py => bareos-fd-percona-xtrabackup.py} | 0 .../source/TasksAndConcepts/Plugins.rst | 2 +- systemtests/CMakeLists.txt | 8 +++---- .../bareos-dir.d/catalog/MyCatalog.conf.in | 0 .../bareos-dir.d/client/bareos-fd.conf.in | 0 .../bareos-dir.d/console/bareos-mon.conf.in | 0 .../bareos-dir.d/director/bareos-dir.conf.in | 0 .../bareos-dir.d/fileset/Catalog.conf.in | 0 .../fileset/PerconaXtraBackupTest.conf.in | 2 +- .../bareos-dir.d/fileset/SelfTest.conf.in | 0 .../bareos-dir.d/job/BackupCatalog.conf.in | 0 .../bareos-dir.d/job/RestoreFiles.conf.in | 0 .../bareos-dir.d/job/backup-bareos-fd.conf.in | 0 .../bareos-dir.d/jobdefs/DefaultJob.conf.in | 0 .../bareos-dir.d/messages/Daemon.conf.in | 0 .../bareos-dir.d/messages/Standard.conf.in | 0 .../bareos-dir.d/pool/Differential.conf | 0 .../etc/bareos/bareos-dir.d/pool/Full.conf | 0 .../bareos/bareos-dir.d/pool/Incremental.conf | 0 .../etc/bareos/bareos-dir.d/pool/Scratch.conf | 0 .../bareos/bareos-dir.d/profile/operator.conf | 0 .../bareos/bareos-dir.d/storage/File.conf.in | 0 .../bareos/bareos-fd.d/client/myself.conf.in | 0 .../bareos-fd.d/director/bareos-dir.conf.in | 0 .../bareos-fd.d/director/bareos-mon.conf.in | 0 .../bareos/bareos-fd.d/messages/Standard.conf | 0 .../bareos-sd.d/device/FileStorage.conf.in | 0 .../bareos-sd.d/director/bareos-dir.conf.in | 0 .../bareos-sd.d/director/bareos-mon.conf.in | 0 .../bareos/bareos-sd.d/messages/Standard.conf | 0 .../bareos-sd.d/storage/bareos-sd.conf.in | 0 .../etc/bareos/bconsole.conf.in | 0 .../client/FileDaemon-local.conf.in | 0 .../director/Director-local.conf.in | 0 .../tray-monitor.d/monitor/bareos-mon.conf.in | 0 .../storage/StorageDaemon-local.conf.in | 0 .../testrunner | 0 40 files changed, 19 insertions(+), 19 deletions(-) rename core/src/plugins/filed/{bareos-fd-percona_xtrabackup.py => bareos-fd-percona-xtrabackup.py} (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/fileset/PerconaXtraBackupTest.conf.in (83%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/messages/Daemon.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/messages/Standard.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/pool/Differential.conf (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/pool/Full.conf (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/pool/Incremental.conf (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/pool/Scratch.conf (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/profile/operator.conf (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-dir.d/storage/File.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-fd.d/client/myself.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-fd.d/director/bareos-mon.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-fd.d/messages/Standard.conf (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-sd.d/device/FileStorage.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-sd.d/director/bareos-mon.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-sd.d/messages/Standard.conf (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/bconsole.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/tray-monitor.d/director/Director-local.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/tray-monitor.d/monitor/bareos-mon.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in (100%) rename systemtests/tests/{python-fd-percona_xtrabackup-plugin-test => python-fd-percona-xtrabackup-plugin-test}/testrunner (100%) diff --git a/core/debian/bareos-filedaemon-percona-xtrabackup-python-plugin.install.in b/core/debian/bareos-filedaemon-percona-xtrabackup-python-plugin.install.in index 7f230d4ccb4..b828764c6e1 100644 --- a/core/debian/bareos-filedaemon-percona-xtrabackup-python-plugin.install.in +++ b/core/debian/bareos-filedaemon-percona-xtrabackup-python-plugin.install.in @@ -1,2 +1,2 @@ -@plugindir@/bareos-fd-percona_xtrabackup.py* +@plugindir@/bareos-fd-percona-xtrabackup.py* @plugindir@/BareosFdPluginPerconaXtraBackup.py* diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec index 7b4447cff07..81783fcd467 100644 --- a/core/platforms/packaging/bareos.spec +++ b/core/platforms/packaging/bareos.spec @@ -577,7 +577,7 @@ Requires: python-pycurl Requires: python-lxml Requires: python-ovirt-engine-sdk4 -%package filedaemon-percona_xtrabackup-python-plugin +%package filedaemon-percona-xtrabackup-python-plugin Summary: LDAP Python plugin for Bareos File daemon Group: Productivity/Archiving/Backup Requires: bareos-filedaemon = %{version} @@ -609,7 +609,7 @@ This package contains the LDAP python plugin for the file daemon This package contains the Ovirt python plugin for the file daemon -%description filedaemon-percona_xtrabackup-python-plugin +%description filedaemon-percona-xtrabackup-python-plugin %{dscr} This package contains the Percona python plugin for the file daemon @@ -1399,13 +1399,13 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d %attr(0640, %{director_daemon_user}, %{daemon_group}) %{_sysconfdir}/%{name}/bareos-dir.d/fileset/plugin-ovirt.conf.example %attr(0640, %{director_daemon_user}, %{daemon_group}) %{_sysconfdir}/%{name}/bareos-dir.d/job/backup-ovirt.conf.example -%files filedaemon-percona_xtrabackup-python-plugin +%files filedaemon-percona-xtrabackup-python-plugin %defattr(-, root, root) -%{plugin_dir}/bareos-fd-percona_xtrabackup.py* +%{plugin_dir}/bareos-fd-percona-xtrabackup.py* %{plugin_dir}/BareosFdPluginPerconaXtraBackup.py* -#%attr(0640, %{director_daemon_user}, %{daemon_group}) %{_sysconfdir}/%{name}/bareos-dir.d/fileset/plugin-percona_xtrabackup.conf.example -#%attr(0640, %{director_daemon_user}, %{daemon_group}) %{_sysconfdir}/%{name}/bareos-dir.d/job/backup-percona_xtrabackup.conf.example -#%attr(0640, %{director_daemon_user}, %{daemon_group}) %{_sysconfdir}/%{name}/bareos-dir.d/job/restore-percona_xtrabackup.conf.example +#%attr(0640, %{director_daemon_user}, %{daemon_group}) %{_sysconfdir}/%{name}/bareos-dir.d/fileset/plugin-percona-xtrabackup.conf.example +#%attr(0640, %{director_daemon_user}, %{daemon_group}) %{_sysconfdir}/%{name}/bareos-dir.d/job/backup-percona-xtrabackup.conf.example +#%attr(0640, %{director_daemon_user}, %{daemon_group}) %{_sysconfdir}/%{name}/bareos-dir.d/job/restore-percona-xtrabackup.conf.example %files director-python-plugin %defattr(-, root, root) @@ -1670,10 +1670,10 @@ fi; \ %posttrans filedaemon-ldap-python-plugin %posttrans_restore_file /etc/%{name}/bareos-dir.d/plugin-python-ldap.conf -#post filedaemon-percona_xtrabackup-python-plugin -#post_backup_file /etc/#{name}/bareos-dir.d/plugin-python-percona_xtrabackup.conf -#posttrans filedaemon-percona_xtrabackup-python-plugin -#posttrans_restore_file /etc/#{name}/bareos-dir.d/plugin-python-percona_xtrabackup.conf +#post filedaemon-percona-xtrabackup-python-plugin +#post_backup_file /etc/#{name}/bareos-dir.d/plugin-python-percona-xtrabackup.conf +#posttrans filedaemon-percona-xtrabackup-python-plugin +#posttrans_restore_file /etc/#{name}/bareos-dir.d/plugin-python-percona-xtrabackup.conf %endif diff --git a/core/src/plugins/filed/CMakeLists.txt b/core/src/plugins/filed/CMakeLists.txt index e55c4cdbcee..b2a7e0cbd69 100644 --- a/core/src/plugins/filed/CMakeLists.txt +++ b/core/src/plugins/filed/CMakeLists.txt @@ -143,7 +143,7 @@ set(PYFILES bareos-fd-ovirt.py BareosFdPluginOvirt.py - bareos-fd-percona_xtrabackup.py + bareos-fd-percona-xtrabackup.py BareosFdPluginPerconaXtraBackup.py ) diff --git a/core/src/plugins/filed/bareos-fd-percona_xtrabackup.py b/core/src/plugins/filed/bareos-fd-percona-xtrabackup.py similarity index 100% rename from core/src/plugins/filed/bareos-fd-percona_xtrabackup.py rename to core/src/plugins/filed/bareos-fd-percona-xtrabackup.py diff --git a/docs/manuals/source/TasksAndConcepts/Plugins.rst b/docs/manuals/source/TasksAndConcepts/Plugins.rst index f5228def331..9077b3a3cce 100644 --- a/docs/manuals/source/TasksAndConcepts/Plugins.rst +++ b/docs/manuals/source/TasksAndConcepts/Plugins.rst @@ -1051,7 +1051,7 @@ Now include the plugin as command-plugin in the Fileset resource: } File = /etc #... - Plugin = "python:module_path=/usr/lib64/bareos/plugins:module_name=bareos-fd-percona_xtrabackup:mycnf=/root/.my.cnf" + Plugin = "python:module_path=/usr/lib64/bareos/plugins:module_name=bareos-fd-percona-xtrabackup:mycnf=/root/.my.cnf" } } diff --git a/systemtests/CMakeLists.txt b/systemtests/CMakeLists.txt index 22628839be8..6f5f9ff4271 100644 --- a/systemtests/CMakeLists.txt +++ b/systemtests/CMakeLists.txt @@ -114,9 +114,9 @@ macro(handle_python_plugin_modules test_name) list(APPEND PYMODULES_TO_LINK_TO_SRC) endif() - if(${test_name} STREQUAL python-fd-percona_xtrabackup-plugin-test) + if(${test_name} STREQUAL python-fd-percona-xtrabackup-plugin-test) list(APPEND PYMODULES_TO_LINK_TO_SRC filed/BareosFdPluginPerconaXtraBackup.py - filed/bareos-fd-percona_xtrabackup.py + filed/bareos-fd-percona-xtrabackup.py ) endif() @@ -397,9 +397,9 @@ else() endif() if(TARGET python-fd AND XTRABACKUP) - list(APPEND SYSTEM_TESTS "python-fd-percona_xtrabackup-plugin-test") + list(APPEND SYSTEM_TESTS "python-fd-percona-xtrabackup-plugin-test") else() - list(APPEND SYSTEM_TESTS_DISABLED "python-fd-percona_xtrabackup-plugin-test") + list(APPEND SYSTEM_TESTS_DISABLED "python-fd-percona-xtrabackup-plugin-test") endif() if(TARGET python-dir) diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/PerconaXtraBackupTest.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/PerconaXtraBackupTest.conf.in similarity index 83% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/PerconaXtraBackupTest.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/PerconaXtraBackupTest.conf.in index 4db71b42590..c9f103d1433 100644 --- a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/PerconaXtraBackupTest.conf.in +++ b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/PerconaXtraBackupTest.conf.in @@ -5,6 +5,6 @@ FileSet { Options { signature = MD5 } - Plugin = "python:module_path=@python_plugin_module_src_test_dir@:module_name=bareos-fd-percona_xtrabackup" + Plugin = "python:module_path=@python_plugin_module_src_test_dir@:module_name=bareos-fd-percona-xtrabackup" } } diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/messages/Daemon.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/messages/Daemon.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/messages/Daemon.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/messages/Standard.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/messages/Standard.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/messages/Standard.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Differential.conf similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Differential.conf rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Differential.conf diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Full.conf similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Full.conf rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Full.conf diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Incremental.conf similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Incremental.conf rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Incremental.conf diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Scratch.conf similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Scratch.conf rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Scratch.conf diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/profile/operator.conf similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/profile/operator.conf rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/profile/operator.conf diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/storage/File.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/storage/File.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/storage/File.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-fd.d/client/myself.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-fd.d/client/myself.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-fd.d/client/myself.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-fd.d/client/myself.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-fd.d/director/bareos-mon.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-fd.d/director/bareos-mon.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-fd.d/director/bareos-mon.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-fd.d/director/bareos-mon.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-fd.d/messages/Standard.conf b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-fd.d/messages/Standard.conf similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-fd.d/messages/Standard.conf rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-fd.d/messages/Standard.conf diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-sd.d/device/FileStorage.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-sd.d/device/FileStorage.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-sd.d/device/FileStorage.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-sd.d/device/FileStorage.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-sd.d/director/bareos-mon.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-sd.d/director/bareos-mon.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-sd.d/director/bareos-mon.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-sd.d/director/bareos-mon.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-sd.d/messages/Standard.conf b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-sd.d/messages/Standard.conf similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-sd.d/messages/Standard.conf rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-sd.d/messages/Standard.conf diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bconsole.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bconsole.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bconsole.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bconsole.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/tray-monitor.d/director/Director-local.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/tray-monitor.d/director/Director-local.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/tray-monitor.d/director/Director-local.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/tray-monitor.d/director/Director-local.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/tray-monitor.d/monitor/bareos-mon.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/tray-monitor.d/monitor/bareos-mon.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/tray-monitor.d/monitor/bareos-mon.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/tray-monitor.d/monitor/bareos-mon.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in diff --git a/systemtests/tests/python-fd-percona_xtrabackup-plugin-test/testrunner b/systemtests/tests/python-fd-percona-xtrabackup-plugin-test/testrunner similarity index 100% rename from systemtests/tests/python-fd-percona_xtrabackup-plugin-test/testrunner rename to systemtests/tests/python-fd-percona-xtrabackup-plugin-test/testrunner