Percona Xtrabackup Plugin: rename percona_xtrabackup to percona-xtrab…

…ackup everywhere

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*

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
 

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
     )
 

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"
        }
    }
 

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)

systemtests/tests/python-fd-percona_xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/PerconaXtraBackupTest.conf.in → 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"
   }
 }