diff --git a/storage/emc/clariion/custom.pm b/centreon/common/emc/navisphere/custom/custom.pm similarity index 98% rename from storage/emc/clariion/custom.pm rename to centreon/common/emc/navisphere/custom/custom.pm index 5201e59a8..9d8814a24 100644 --- a/storage/emc/clariion/custom.pm +++ b/centreon/common/emc/navisphere/custom/custom.pm @@ -33,7 +33,7 @@ # #################################################################################### -package storage::emc::clariion::custom; +package centreon::common::emc::navisphere::custom::custom; use strict; use warnings; @@ -74,7 +74,7 @@ sub new { "timeout:s@" => { name => 'timeout' }, }); } - $options{options}->add_help(package => __PACKAGE__, sections => 'CLARIION OPTIONS', once => 1); + $options{options}->add_help(package => __PACKAGE__, sections => 'NAVISPHERE OPTIONS', once => 1); $self->{output} = $options{output}; $self->{mode} = $options{mode}; @@ -221,13 +221,13 @@ __END__ =head1 NAME -Clariion +Navisphere =head1 SYNOPSIS my navisphere manage -=head1 CLARIION OPTIONS +=head1 NAVISPHERE OPTIONS =over 8 @@ -258,7 +258,7 @@ To be used for set a file. (Need to change command and use 'cat' instead). =item B<--hostname> -Emc Clariion SP Hostname. +Emc Clariion/VNX SP Hostname. =item B<--secfilepath> diff --git a/storage/emc/clariion/mode/cache.pm b/centreon/common/emc/navisphere/mode/cache.pm similarity index 99% rename from storage/emc/clariion/mode/cache.pm rename to centreon/common/emc/navisphere/mode/cache.pm index 16b439ad4..3ea2d8e5c 100644 --- a/storage/emc/clariion/mode/cache.pm +++ b/centreon/common/emc/navisphere/mode/cache.pm @@ -33,7 +33,7 @@ # #################################################################################### -package storage::emc::clariion::mode::cache; +package centreon::common::emc::navisphere::mode::cache; use base qw(centreon::plugins::mode); diff --git a/storage/emc/clariion/mode/controller.pm b/centreon/common/emc/navisphere/mode/controller.pm similarity index 99% rename from storage/emc/clariion/mode/controller.pm rename to centreon/common/emc/navisphere/mode/controller.pm index 05412a080..25a5552a3 100644 --- a/storage/emc/clariion/mode/controller.pm +++ b/centreon/common/emc/navisphere/mode/controller.pm @@ -33,7 +33,7 @@ # #################################################################################### -package storage::emc::clariion::mode::controller; +package centreon::common::emc::navisphere::mode::controller; use base qw(centreon::plugins::mode); diff --git a/storage/emc/clariion/mode/disk.pm b/centreon/common/emc/navisphere/mode/disk.pm similarity index 99% rename from storage/emc/clariion/mode/disk.pm rename to centreon/common/emc/navisphere/mode/disk.pm index d33e2f86a..a0cdf4385 100644 --- a/storage/emc/clariion/mode/disk.pm +++ b/centreon/common/emc/navisphere/mode/disk.pm @@ -33,7 +33,7 @@ # #################################################################################### -package storage::emc::clariion::mode::disk; +package centreon::common::emc::navisphere::mode::disk; sub get_absolute { my ($self, %options) = @_; diff --git a/storage/emc/clariion/mode/faults.pm b/centreon/common/emc/navisphere/mode/faults.pm similarity index 98% rename from storage/emc/clariion/mode/faults.pm rename to centreon/common/emc/navisphere/mode/faults.pm index afbfa6629..a2c051f2a 100644 --- a/storage/emc/clariion/mode/faults.pm +++ b/centreon/common/emc/navisphere/mode/faults.pm @@ -33,7 +33,7 @@ # #################################################################################### -package storage::emc::clariion::mode::faults; +package centreon::common::emc::navisphere::mode::faults; use base qw(centreon::plugins::mode); diff --git a/storage/emc/clariion/mode/hbastate.pm b/centreon/common/emc/navisphere/mode/hbastate.pm similarity index 99% rename from storage/emc/clariion/mode/hbastate.pm rename to centreon/common/emc/navisphere/mode/hbastate.pm index 2db07b53b..76a213192 100644 --- a/storage/emc/clariion/mode/hbastate.pm +++ b/centreon/common/emc/navisphere/mode/hbastate.pm @@ -33,7 +33,7 @@ # #################################################################################### -package storage::emc::clariion::mode::hbastate; +package centreon::common::emc::navisphere::mode::hbastate; use base qw(centreon::plugins::mode); diff --git a/storage/emc/clariion/mode/listluns.pm b/centreon/common/emc/navisphere/mode/listluns.pm similarity index 99% rename from storage/emc/clariion/mode/listluns.pm rename to centreon/common/emc/navisphere/mode/listluns.pm index cdaa890df..ac3ae3482 100644 --- a/storage/emc/clariion/mode/listluns.pm +++ b/centreon/common/emc/navisphere/mode/listluns.pm @@ -35,7 +35,7 @@ # Based on Apache Mode by Simon BOMM #################################################################################### -package storage::emc::clariion::mode::listluns; +package centreon::common::emc::navisphere::mode::listluns; use base qw(centreon::plugins::mode); diff --git a/storage/emc/clariion/mode/portstate.pm b/centreon/common/emc/navisphere/mode/portstate.pm similarity index 98% rename from storage/emc/clariion/mode/portstate.pm rename to centreon/common/emc/navisphere/mode/portstate.pm index 13872a56d..56ad8471a 100644 --- a/storage/emc/clariion/mode/portstate.pm +++ b/centreon/common/emc/navisphere/mode/portstate.pm @@ -33,7 +33,7 @@ # #################################################################################### -package storage::emc::clariion::mode::portstate; +package centreon::common::emc::navisphere::mode::portstate; use base qw(centreon::plugins::mode); diff --git a/storage/emc/clariion/mode/sp.pm b/centreon/common/emc/navisphere/mode/sp.pm similarity index 76% rename from storage/emc/clariion/mode/sp.pm rename to centreon/common/emc/navisphere/mode/sp.pm index e7b24a691..624046524 100644 --- a/storage/emc/clariion/mode/sp.pm +++ b/centreon/common/emc/navisphere/mode/sp.pm @@ -33,21 +33,21 @@ # #################################################################################### -package storage::emc::clariion::mode::sp; +package centreon::common::emc::navisphere::mode::sp; use base qw(centreon::plugins::mode); use strict; use warnings; -use storage::emc::clariion::mode::spcomponents::fan; -use storage::emc::clariion::mode::spcomponents::lcc; -use storage::emc::clariion::mode::spcomponents::psu; -use storage::emc::clariion::mode::spcomponents::battery; -use storage::emc::clariion::mode::spcomponents::memory; -use storage::emc::clariion::mode::spcomponents::cpu; -use storage::emc::clariion::mode::spcomponents::iomodule; -use storage::emc::clariion::mode::spcomponents::cable; -use storage::emc::clariion::mode::spcomponents::sp; +use centreon::common::emc::navisphere::mode::spcomponents::fan; +use centreon::common::emc::navisphere::mode::spcomponents::lcc; +use centreon::common::emc::navisphere::mode::spcomponents::psu; +use centreon::common::emc::navisphere::spcomponents::battery; +use centreon::common::emc::navisphere::spcomponents::memory; +use centreon::common::emc::navisphere::spcomponents::cpu; +use centreon::common::emc::navisphere::spcomponents::iomodule; +use centreon::common::emc::navisphere::spcomponents::cable; +use centreon::common::emc::navisphere::spcomponents::sp; sub new { my ($class, %options) = @_; @@ -86,33 +86,33 @@ sub component { my ($self, %options) = @_; if ($self->{option_results}->{component} eq 'all') { - storage::emc::clariion::mode::spcomponents::fan::check($self); - storage::emc::clariion::mode::spcomponents::lcc::check($self); - storage::emc::clariion::mode::spcomponents::psu::check($self); - storage::emc::clariion::mode::spcomponents::battery::check($self); - storage::emc::clariion::mode::spcomponents::cable::check($self); - storage::emc::clariion::mode::spcomponents::iomodule::check($self); - storage::emc::clariion::mode::spcomponents::memory::check($self); - storage::emc::clariion::mode::spcomponents::cpu::check($self); - storage::emc::clariion::mode::spcomponents::sp::check($self); + centreon::common::emc::navisphere::mode::spcomponents::fan::check($self); + centreon::common::emc::navisphere::mode::spcomponents::lcc::check($self); + centreon::common::emc::navisphere::mode::spcomponents::psu::check($self); + centreon::common::emc::navisphere::mode::spcomponents::battery::check($self); + centreon::common::emc::navisphere::mode::spcomponents::cable::check($self); + centreon::common::emc::navisphere::mode::spcomponents::iomodule::check($self); + centreon::common::emc::navisphere::mode::spcomponents::memory::check($self); + centreon::common::emc::navisphere::mode::spcomponents::cpu::check($self); + centreon::common::emc::navisphere::mode::spcomponents::sp::check($self); } elsif ($self->{option_results}->{component} eq 'sp') { - storage::emc::clariion::mode::spcomponents::sp::check($self); + centreon::common::emc::navisphere::mode::spcomponents::sp::check($self); } elsif ($self->{option_results}->{component} eq 'fan') { - storage::emc::clariion::mode::spcomponents::fan::check($self); + centreon::common::emc::navisphere::mode::spcomponents::fan::check($self); } elsif ($self->{option_results}->{component} eq 'lcc') { - storage::emc::clariion::mode::spcomponents::lcc::check($self); + centreon::common::emc::navisphere::mode::spcomponents::lcc::check($self); } elsif ($self->{option_results}->{component} eq 'psu') { - storage::emc::clariion::mode::spcomponents::psu::check($self); + centreon::common::emc::navisphere::mode::spcomponents::psu::check($self); } elsif ($self->{option_results}->{component} eq 'battery') { - storage::emc::clariion::mode::spcomponents::psu::check($self); + centreon::common::emc::navisphere::mode::spcomponents::psu::check($self); } elsif ($self->{option_results}->{component} eq 'memory') { - storage::emc::clariion::mode::spcomponents::memory::check($self); + centreon::common::emc::navisphere::mode::spcomponents::memory::check($self); } elsif ($self->{option_results}->{component} eq 'cpu') { - storage::emc::clariion::mode::spcomponents::cpu::check($self); + centreon::common::emc::navisphere::mode::spcomponents::cpu::check($self); } elsif ($self->{option_results}->{component} eq 'io') { - storage::emc::clariion::mode::spcomponents::iomodule::check($self); + centreon::common::emc::navisphere::mode::spcomponents::iomodule::check($self); } elsif ($self->{option_results}->{component} eq 'cable') { - storage::emc::clariion::mode::spcomponents::cable::check($self); + centreon::common::emc::navisphere::mode::spcomponents::cable::check($self); } else { $self->{output}->add_option_msg(short_msg => "Wrong option. Cannot find component '" . $self->{option_results}->{component} . "'."); $self->{output}->option_exit(); diff --git a/storage/emc/clariion/mode/spcomponents/battery.pm b/centreon/common/emc/navisphere/mode/spcomponents/battery.pm similarity index 100% rename from storage/emc/clariion/mode/spcomponents/battery.pm rename to centreon/common/emc/navisphere/mode/spcomponents/battery.pm diff --git a/storage/emc/clariion/mode/spcomponents/cable.pm b/centreon/common/emc/navisphere/mode/spcomponents/cable.pm similarity index 100% rename from storage/emc/clariion/mode/spcomponents/cable.pm rename to centreon/common/emc/navisphere/mode/spcomponents/cable.pm diff --git a/storage/emc/clariion/mode/spcomponents/cpu.pm b/centreon/common/emc/navisphere/mode/spcomponents/cpu.pm similarity index 100% rename from storage/emc/clariion/mode/spcomponents/cpu.pm rename to centreon/common/emc/navisphere/mode/spcomponents/cpu.pm diff --git a/storage/emc/clariion/mode/spcomponents/fan.pm b/centreon/common/emc/navisphere/mode/spcomponents/fan.pm similarity index 100% rename from storage/emc/clariion/mode/spcomponents/fan.pm rename to centreon/common/emc/navisphere/mode/spcomponents/fan.pm diff --git a/storage/emc/clariion/mode/spcomponents/iomodule.pm b/centreon/common/emc/navisphere/mode/spcomponents/iomodule.pm similarity index 100% rename from storage/emc/clariion/mode/spcomponents/iomodule.pm rename to centreon/common/emc/navisphere/mode/spcomponents/iomodule.pm diff --git a/storage/emc/clariion/mode/spcomponents/lcc.pm b/centreon/common/emc/navisphere/mode/spcomponents/lcc.pm similarity index 100% rename from storage/emc/clariion/mode/spcomponents/lcc.pm rename to centreon/common/emc/navisphere/mode/spcomponents/lcc.pm diff --git a/storage/emc/clariion/mode/spcomponents/memory.pm b/centreon/common/emc/navisphere/mode/spcomponents/memory.pm similarity index 100% rename from storage/emc/clariion/mode/spcomponents/memory.pm rename to centreon/common/emc/navisphere/mode/spcomponents/memory.pm diff --git a/storage/emc/clariion/mode/spcomponents/psu.pm b/centreon/common/emc/navisphere/mode/spcomponents/psu.pm similarity index 100% rename from storage/emc/clariion/mode/spcomponents/psu.pm rename to centreon/common/emc/navisphere/mode/spcomponents/psu.pm diff --git a/storage/emc/clariion/mode/spcomponents/sp.pm b/centreon/common/emc/navisphere/mode/spcomponents/sp.pm similarity index 100% rename from storage/emc/clariion/mode/spcomponents/sp.pm rename to centreon/common/emc/navisphere/mode/spcomponents/sp.pm diff --git a/storage/emc/clariion/mode/spinfo.pm b/centreon/common/emc/navisphere/mode/spinfo.pm similarity index 98% rename from storage/emc/clariion/mode/spinfo.pm rename to centreon/common/emc/navisphere/mode/spinfo.pm index 5ea2cf3f7..c869a130f 100644 --- a/storage/emc/clariion/mode/spinfo.pm +++ b/centreon/common/emc/navisphere/mode/spinfo.pm @@ -33,7 +33,7 @@ # #################################################################################### -package storage::emc::clariion::mode::spinfo; +package centreon::common::emc::navisphere::mode::spinfo; use base qw(centreon::plugins::mode); diff --git a/storage/emc/clariion/plugin.pm b/storage/emc/clariion/plugin.pm index b681ed055..b41cbeed2 100644 --- a/storage/emc/clariion/plugin.pm +++ b/storage/emc/clariion/plugin.pm @@ -48,17 +48,17 @@ sub new { $self->{version} = '0.1'; %{$self->{modes}} = ( - 'cache' => 'storage::emc::clariion::mode::cache', - 'controller' => 'storage::emc::clariion::mode::controller', - 'disk' => 'storage::emc::clariion::mode::disk', - 'sp' => 'storage::emc::clariion::mode::sp', - 'faults' => 'storage::emc::clariion::mode::faults', - 'list-luns' => 'storage::emc::clariion::mode::listluns', - 'sp-info' => 'storage::emc::clariion::mode::spinfo', - 'port-state' => 'storage::emc::clariion::mode::portstate', - 'hba-state' => 'storage::emc::clariion::mode::hbastate', + 'cache' => 'centreon::common::emc::navisphere::mode::cache', + 'controller' => 'centreon::common::emc::navisphere::mode::controller', + 'disk' => 'centreon::common::emc::navisphere::mode::disk', + 'sp' => 'centreon::common::emc::navisphere::mode::sp', + 'faults' => 'centreon::common::emc::navisphere::mode::faults', + 'list-luns' => 'centreon::common::emc::navisphere::mode::listluns', + 'sp-info' => 'centreon::common::emc::navisphere::mode::spinfo', + 'port-state' => 'centreon::common::emc::navisphere::mode::portstate', + 'hba-state' => 'centreon::common::emc::navisphere::mode::hbastate', ); - $self->{custom_modes}{clariion} = 'storage::emc::clariion::custom'; + $self->{custom_modes}{clariion} = 'centreon::common::emc::navisphere::custom::custom'; return $self; }