diff --git a/packaging/centreon-plugin-Network-Backbox-Rest/pkg.json b/packaging/centreon-plugin-Network-Backbox-Rest/pkg.json deleted file mode 100644 index 90b98e4d5..000000000 --- a/packaging/centreon-plugin-Network-Backbox-Rest/pkg.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "pkg_name": "centreon-plugin-Network-Backbox-Rest", - "pkg_summary": "Centreon Plugin to monitor Backbox using RestAPI", - "plugin_name": "centreon_backbox_rest.pl", - "files": [ - "centreon/plugins/script_custom.pm", - "network/backbox/rest/" - ] -} diff --git a/packaging/centreon-plugin-Network-Backbox-Rest/deb.json b/packaging/centreon-plugin-Network-Backbox-Restapi/deb.json similarity index 100% rename from packaging/centreon-plugin-Network-Backbox-Rest/deb.json rename to packaging/centreon-plugin-Network-Backbox-Restapi/deb.json diff --git a/packaging/centreon-plugin-Network-Backbox-Restapi/pkg.json b/packaging/centreon-plugin-Network-Backbox-Restapi/pkg.json new file mode 100644 index 000000000..f7b4285b7 --- /dev/null +++ b/packaging/centreon-plugin-Network-Backbox-Restapi/pkg.json @@ -0,0 +1,9 @@ +{ + "pkg_name": "centreon-plugin-Network-Backbox-Restapi", + "pkg_summary": "Centreon Plugin to monitor Backbox using RestAPI", + "plugin_name": "centreon_backbox_restapi.pl", + "files": [ + "centreon/plugins/script_custom.pm", + "network/backbox/restapi/" + ] +} diff --git a/packaging/centreon-plugin-Network-Backbox-Rest/rpm.json b/packaging/centreon-plugin-Network-Backbox-Restapi/rpm.json similarity index 100% rename from packaging/centreon-plugin-Network-Backbox-Rest/rpm.json rename to packaging/centreon-plugin-Network-Backbox-Restapi/rpm.json diff --git a/src/network/backbox/rest/custom/api.pm b/src/network/backbox/restapi/custom/api.pm similarity index 99% rename from src/network/backbox/rest/custom/api.pm rename to src/network/backbox/restapi/custom/api.pm index cf9d2ad78..9ba302c6a 100644 --- a/src/network/backbox/rest/custom/api.pm +++ b/src/network/backbox/restapi/custom/api.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::backbox::rest::custom::api; +package network::backbox::restapi::custom::api; use strict; use warnings; diff --git a/src/network/backbox/rest/mode/backup.pm b/src/network/backbox/restapi/mode/backup.pm similarity index 98% rename from src/network/backbox/rest/mode/backup.pm rename to src/network/backbox/restapi/mode/backup.pm index 01b0af150..be13d97da 100644 --- a/src/network/backbox/rest/mode/backup.pm +++ b/src/network/backbox/restapi/mode/backup.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::backbox::rest::mode::backup; +package network::backbox::restapi::mode::backup; use base qw(centreon::plugins::templates::counter); diff --git a/src/network/backbox/rest/mode/configstatus.pm b/src/network/backbox/restapi/mode/configstatus.pm similarity index 98% rename from src/network/backbox/rest/mode/configstatus.pm rename to src/network/backbox/restapi/mode/configstatus.pm index 92c4fb3a8..0cd5a3975 100644 --- a/src/network/backbox/rest/mode/configstatus.pm +++ b/src/network/backbox/restapi/mode/configstatus.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::backbox::rest::mode::configstatus; +package network::backbox::restapi::mode::configstatus; use base qw(centreon::plugins::templates::counter); diff --git a/src/network/backbox/rest/mode/intellicheck.pm b/src/network/backbox/restapi/mode/intellicheck.pm similarity index 98% rename from src/network/backbox/rest/mode/intellicheck.pm rename to src/network/backbox/restapi/mode/intellicheck.pm index c2b96b8b5..779218cc6 100644 --- a/src/network/backbox/rest/mode/intellicheck.pm +++ b/src/network/backbox/restapi/mode/intellicheck.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::backbox::rest::mode::intellicheck; +package network::backbox::restapi::mode::intellicheck; use base qw(centreon::plugins::templates::counter); diff --git a/src/network/backbox/rest/plugin.pm b/src/network/backbox/restapi/plugin.pm similarity index 76% rename from src/network/backbox/rest/plugin.pm rename to src/network/backbox/restapi/plugin.pm index ffe7ddbc8..f88a79e0a 100644 --- a/src/network/backbox/rest/plugin.pm +++ b/src/network/backbox/restapi/plugin.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::backbox::rest::plugin; +package network::backbox::restapi::plugin; use strict; use warnings; @@ -31,12 +31,12 @@ sub new { $self->{version} = '1.0'; $self->{modes} = { - 'backup' => 'network::backbox::rest::mode::backup', - 'configstatus' => 'network::backbox::rest::mode::configstatus', - 'intellicheck' => 'network::backbox::rest::mode::intellicheck' + 'backup' => 'network::backbox::restapi::mode::backup', + 'configstatus' => 'network::backbox::restapi::mode::configstatus', + 'intellicheck' => 'network::backbox::restapi::mode::intellicheck' }; - $self->{custom_modes}->{api} = 'network::backbox::rest::custom::api'; + $self->{custom_modes}->{api} = 'network::backbox::restapi::custom::api'; return $self; } diff --git a/tests/network/backbox/rest/backbox.json b/tests/network/backbox/restapi/backbox.json similarity index 100% rename from tests/network/backbox/rest/backbox.json rename to tests/network/backbox/restapi/backbox.json diff --git a/tests/network/backbox/rest/backup.robot b/tests/network/backbox/restapi/backup.robot similarity index 97% rename from tests/network/backbox/rest/backup.robot rename to tests/network/backbox/restapi/backup.robot index 240ba8a0a..0ae7ab5ef 100644 --- a/tests/network/backbox/rest/backup.robot +++ b/tests/network/backbox/restapi/backup.robot @@ -12,7 +12,7 @@ Test Timeout 120s ${MOCKOON_JSON} ${CURDIR}${/}backbox.json ${cmd} ${CENTREON_PLUGINS} -... --plugin=network::backbox::rest::plugin +... --plugin=network::backbox::restapi::plugin ... --custommode=api ... --hostname=${HOSTNAME} ... --port=${APIPORT} @@ -23,7 +23,7 @@ ${cmd} ${CENTREON_PLUGINS} *** Test Cases *** backups ${tc} [Documentation] Check the backups status - [Tags] network backbox rest backup + [Tags] network backbox restapi backup ${command} Catenate ... ${cmd} ... --mode=backup diff --git a/tests/network/backbox/rest/configstatus.robot b/tests/network/backbox/restapi/configstatus.robot similarity index 94% rename from tests/network/backbox/rest/configstatus.robot rename to tests/network/backbox/restapi/configstatus.robot index d13b62030..756ea45c8 100644 --- a/tests/network/backbox/rest/configstatus.robot +++ b/tests/network/backbox/restapi/configstatus.robot @@ -12,7 +12,7 @@ Test Timeout 120s ${MOCKOON_JSON} ${CURDIR}${/}backbox.json ${cmd} ${CENTREON_PLUGINS} -... --plugin=network::backbox::rest::plugin +... --plugin=network::backbox::restapi::plugin ... --custommode=api ... --hostname=${HOSTNAME} ... --port=${APIPORT} @@ -24,7 +24,7 @@ ${cmd} ${CENTREON_PLUGINS} *** Test Cases *** configstatus ${tc} [Documentation] Check the config status - [Tags] network backbox rest configstatus + [Tags] network backbox restapi configstatus ${command} Catenate ... ${cmd} ... ${extraoptions} diff --git a/tests/network/backbox/rest/intellicheck.robot b/tests/network/backbox/restapi/intellicheck.robot similarity index 97% rename from tests/network/backbox/rest/intellicheck.robot rename to tests/network/backbox/restapi/intellicheck.robot index bc9fdbab7..c441e039b 100644 --- a/tests/network/backbox/rest/intellicheck.robot +++ b/tests/network/backbox/restapi/intellicheck.robot @@ -12,7 +12,7 @@ Test Timeout 120s ${MOCKOON_JSON} ${CURDIR}${/}backbox.json ${cmd} ${CENTREON_PLUGINS} -... --plugin=network::backbox::rest::plugin +... --plugin=network::backbox::restapi::plugin ... --custommode=api ... --hostname=${HOSTNAME} ... --port=${APIPORT} @@ -24,7 +24,7 @@ ${cmd} ${CENTREON_PLUGINS} *** Test Cases *** intellichecks ${tc} [Documentation] Check the intellichecks status - [Tags] network backbox rest intellicheck + [Tags] network backbox restapi intellicheck ${command} Catenate ... ${cmd} ... ${extraoptions}