From a8f59c89c820f0153728d0c80f5235170ff81b59 Mon Sep 17 00:00:00 2001
From: Quentin Garnier <qgarnier@merethis.com>
Date: Fri, 12 Dec 2014 10:10:22 +0100
Subject: [PATCH] Some fix for clariion, datadomain and violin

---
 centreon/common/emc/navisphere/mode/hbastate.pm      |  2 +-
 centreon/common/emc/navisphere/mode/portstate.pm     |  6 ------
 centreon/common/emc/navisphere/mode/sp.pm            | 12 ++++++------
 .../emc/navisphere/mode/spcomponents/battery.pm      |  2 +-
 .../common/emc/navisphere/mode/spcomponents/cable.pm |  2 +-
 .../common/emc/navisphere/mode/spcomponents/cpu.pm   |  2 +-
 .../common/emc/navisphere/mode/spcomponents/fan.pm   |  2 +-
 .../emc/navisphere/mode/spcomponents/iomodule.pm     |  2 +-
 .../common/emc/navisphere/mode/spcomponents/lcc.pm   |  2 +-
 .../emc/navisphere/mode/spcomponents/memory.pm       |  2 +-
 .../common/emc/navisphere/mode/spcomponents/psu.pm   |  2 +-
 .../common/emc/navisphere/mode/spcomponents/sp.pm    |  2 +-
 .../violin/snmp/mode/components/temperature.pm       |  2 +-
 storage/emc/DataDomain/mode/components/disk.pm       |  2 +-
 14 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/centreon/common/emc/navisphere/mode/hbastate.pm b/centreon/common/emc/navisphere/mode/hbastate.pm
index 76a213192..7cbd65077 100644
--- a/centreon/common/emc/navisphere/mode/hbastate.pm
+++ b/centreon/common/emc/navisphere/mode/hbastate.pm
@@ -194,7 +194,7 @@ Set hba uid to check (not set, means 'all').
 
 Set how much path must be connected (Can be multiple).
 Syntax: [WARNING],[CRITICAL],filter_uid,filter_server
-Example: ,,@0:1,.* - Means all server must have at least two paths connected.
+Example: ,@0:1,.*,.* - Means all server must have at least two paths connected.
 
 =back
 
diff --git a/centreon/common/emc/navisphere/mode/portstate.pm b/centreon/common/emc/navisphere/mode/portstate.pm
index 56ad8471a..7cf96bb34 100644
--- a/centreon/common/emc/navisphere/mode/portstate.pm
+++ b/centreon/common/emc/navisphere/mode/portstate.pm
@@ -61,12 +61,6 @@ sub check_options {
     $self->SUPER::init(%options);
 }
 
-sub check_logged {
-    my ($self, %options) = @_;
-    
-    
-}
-
 sub check_port {
     my ($self, %options) = @_;
     
diff --git a/centreon/common/emc/navisphere/mode/sp.pm b/centreon/common/emc/navisphere/mode/sp.pm
index 624046524..5edd9a4a7 100644
--- a/centreon/common/emc/navisphere/mode/sp.pm
+++ b/centreon/common/emc/navisphere/mode/sp.pm
@@ -42,12 +42,12 @@ use warnings;
 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;
+use centreon::common::emc::navisphere::mode::spcomponents::battery;
+use centreon::common::emc::navisphere::mode::spcomponents::memory;
+use centreon::common::emc::navisphere::mode::spcomponents::cpu;
+use centreon::common::emc::navisphere::mode::spcomponents::iomodule;
+use centreon::common::emc::navisphere::mode::spcomponents::cable;
+use centreon::common::emc::navisphere::mode::spcomponents::sp;
 
 sub new {
     my ($class, %options) = @_;
diff --git a/centreon/common/emc/navisphere/mode/spcomponents/battery.pm b/centreon/common/emc/navisphere/mode/spcomponents/battery.pm
index 36c5987da..570a7aa42 100644
--- a/centreon/common/emc/navisphere/mode/spcomponents/battery.pm
+++ b/centreon/common/emc/navisphere/mode/spcomponents/battery.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package storage::emc::clariion::mode::spcomponents::battery;
+package centreon::common::emc::navisphere::mode::spcomponents::battery;
 
 use strict;
 use warnings;
diff --git a/centreon/common/emc/navisphere/mode/spcomponents/cable.pm b/centreon/common/emc/navisphere/mode/spcomponents/cable.pm
index f2de605e2..56d4fca34 100644
--- a/centreon/common/emc/navisphere/mode/spcomponents/cable.pm
+++ b/centreon/common/emc/navisphere/mode/spcomponents/cable.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package storage::emc::clariion::mode::spcomponents::cable;
+package centreon::common::emc::navisphere::mode::spcomponents::cable;
 
 use strict;
 use warnings;
diff --git a/centreon/common/emc/navisphere/mode/spcomponents/cpu.pm b/centreon/common/emc/navisphere/mode/spcomponents/cpu.pm
index 5f7a0a212..e867dbddd 100644
--- a/centreon/common/emc/navisphere/mode/spcomponents/cpu.pm
+++ b/centreon/common/emc/navisphere/mode/spcomponents/cpu.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package storage::emc::clariion::mode::spcomponents::cpu;
+package centreon::common::emc::navisphere::mode::spcomponents::cpu;
 
 use strict;
 use warnings;
diff --git a/centreon/common/emc/navisphere/mode/spcomponents/fan.pm b/centreon/common/emc/navisphere/mode/spcomponents/fan.pm
index 95f4dfcfc..9e6db5c7a 100644
--- a/centreon/common/emc/navisphere/mode/spcomponents/fan.pm
+++ b/centreon/common/emc/navisphere/mode/spcomponents/fan.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package storage::emc::clariion::mode::spcomponents::fan;
+package centreon::common::emc::navisphere::mode::spcomponents::fan;
 
 use strict;
 use warnings;
diff --git a/centreon/common/emc/navisphere/mode/spcomponents/iomodule.pm b/centreon/common/emc/navisphere/mode/spcomponents/iomodule.pm
index 0c823d01b..261b4a19d 100644
--- a/centreon/common/emc/navisphere/mode/spcomponents/iomodule.pm
+++ b/centreon/common/emc/navisphere/mode/spcomponents/iomodule.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package storage::emc::clariion::mode::spcomponents::iomodule;
+package centreon::common::emc::navisphere::mode::spcomponents::iomodule;
 
 use strict;
 use warnings;
diff --git a/centreon/common/emc/navisphere/mode/spcomponents/lcc.pm b/centreon/common/emc/navisphere/mode/spcomponents/lcc.pm
index a09128d1d..6eed74ca2 100644
--- a/centreon/common/emc/navisphere/mode/spcomponents/lcc.pm
+++ b/centreon/common/emc/navisphere/mode/spcomponents/lcc.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package storage::emc::clariion::mode::spcomponents::lcc;
+package centreon::common::emc::navisphere::mode::spcomponents::lcc;
 
 use strict;
 use warnings;
diff --git a/centreon/common/emc/navisphere/mode/spcomponents/memory.pm b/centreon/common/emc/navisphere/mode/spcomponents/memory.pm
index 3098464fb..866a511bd 100644
--- a/centreon/common/emc/navisphere/mode/spcomponents/memory.pm
+++ b/centreon/common/emc/navisphere/mode/spcomponents/memory.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package storage::emc::clariion::mode::spcomponents::memory;
+package centreon::common::emc::navisphere::mode::spcomponents::memory;
 
 use strict;
 use warnings;
diff --git a/centreon/common/emc/navisphere/mode/spcomponents/psu.pm b/centreon/common/emc/navisphere/mode/spcomponents/psu.pm
index 73f33d02e..f0ca2aa9d 100644
--- a/centreon/common/emc/navisphere/mode/spcomponents/psu.pm
+++ b/centreon/common/emc/navisphere/mode/spcomponents/psu.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package storage::emc::clariion::mode::spcomponents::psu;
+package centreon::common::emc::navisphere::mode::spcomponents::psu;
 
 use strict;
 use warnings;
diff --git a/centreon/common/emc/navisphere/mode/spcomponents/sp.pm b/centreon/common/emc/navisphere/mode/spcomponents/sp.pm
index bde1e50ff..8766a0048 100644
--- a/centreon/common/emc/navisphere/mode/spcomponents/sp.pm
+++ b/centreon/common/emc/navisphere/mode/spcomponents/sp.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package storage::emc::clariion::mode::spcomponents::sp;
+package centreon::common::emc::navisphere::mode::spcomponents::sp;
 
 use strict;
 use warnings;
diff --git a/centreon/common/violin/snmp/mode/components/temperature.pm b/centreon/common/violin/snmp/mode/components/temperature.pm
index 4fbc4d79d..7ad8bb9b7 100644
--- a/centreon/common/violin/snmp/mode/components/temperature.pm
+++ b/centreon/common/violin/snmp/mode/components/temperature.pm
@@ -64,7 +64,7 @@ sub temperature {
 
     return if ($self->check_exclude(section => 'temperature', instance => $instance));
         
-    $self->{components}->{psu}->{total}++;
+    $self->{components}->{temperature}->{total}++;
     $self->{output}->output_add(long_msg => sprintf("Temperature '%s' is %s degree centigrade.",
                                 $instance, $temperature));
     my ($exit, $warn, $crit) = $self->get_severity_numeric(section => 'temperature', instance => $instance, value => $temperature);
diff --git a/storage/emc/DataDomain/mode/components/disk.pm b/storage/emc/DataDomain/mode/components/disk.pm
index 8da978b36..fa9d19cc5 100644
--- a/storage/emc/DataDomain/mode/components/disk.pm
+++ b/storage/emc/DataDomain/mode/components/disk.pm
@@ -77,7 +77,7 @@ sub check {
         $self->{components}->{disk}->{total}++;
         $self->{output}->output_add(long_msg => sprintf("Disk '%s' status is '%s'",
                                     $instance, $disk_status));
-        my $exit = $self->get_severity(section => 'fan', value => $disk_status);
+        my $exit = $self->get_severity(section => 'disk', value => $disk_status);
         if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
             $self->{output}->output_add(severity => $exit,
                                         short_msg => sprintf("Disk '%s' status is '%s'", $instance, $disk_status));