From c195ec22652c41a5531004ba70f75f7eccea26a6 Mon Sep 17 00:00:00 2001
From: garnier-quentin <qgarnier@centreon.com>
Date: Mon, 15 Jun 2015 14:19:56 +0200
Subject: [PATCH] + Fix h3c mode cpu and memory

---
 network/h3c/snmp/mode/cpu.pm    |  2 +-
 network/h3c/snmp/mode/memory.pm | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/network/h3c/snmp/mode/cpu.pm b/network/h3c/snmp/mode/cpu.pm
index b7956e4ca..bd19a8825 100644
--- a/network/h3c/snmp/mode/cpu.pm
+++ b/network/h3c/snmp/mode/cpu.pm
@@ -237,7 +237,7 @@ sub manage_selection {
     }
     
     my $mapping = {
-        EntityExtCpuUsage => { oid => $self->{branch} . '.6' },
+        EntityExtCpuUsage => { oid => $self->{branch} },
     };
     
     $self->{cpu} = {};
diff --git a/network/h3c/snmp/mode/memory.pm b/network/h3c/snmp/mode/memory.pm
index d81db226f..81707d275 100644
--- a/network/h3c/snmp/mode/memory.pm
+++ b/network/h3c/snmp/mode/memory.pm
@@ -70,17 +70,17 @@ sub custom_usage_perfdata {
     }
     
     if ($self->{result_values}->{total} == 4294967295) {
-        $self->{output}->perfdata_add(label => 'used' . $extra_label, unit => 'B',
-                                      value => $self->{result_values}->{used},
-                                      warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{label}, total => $self->{result_values}->{total}, cast_int => 1),
-                                      critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{label}, total => $self->{result_values}->{total}, cast_int => 1),
-                                      min => 0, max => $self->{result_values}->{total});
-    } else {
         $self->{output}->perfdata_add(label => 'used' . $extra_label, unit => '%',
-                                      value => $self->{result_values}->{prtc_used},
+                                      value => $self->{result_values}->{prct_used},
                                       warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{label}),
                                       critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{label}),
                                       min => 0, max => 100);
+    } else {
+        $self->{output}->perfdata_add(label => 'used' . $extra_label, unit => 'B',
+                                      value => int($self->{result_values}->{used}),
+                                      warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{label}, total => $self->{result_values}->{total}, cast_int => 1),
+                                      critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{label}, total => $self->{result_values}->{total}, cast_int => 1),
+                                      min => 0, max => $self->{result_values}->{total});
     }
 }
 
@@ -209,7 +209,7 @@ sub run {
             $maps_counters->{$_}->{obj}->perfdata(extra_instance => $multiple);
         }
 
-        $self->{output}->output_add(long_msg => "Memory '" . $self->{memory_selected}->{$id}->{display} . "' $long_msg [entity = '" . $self->{cpu}->{$id}->{name} . "']");
+        $self->{output}->output_add(long_msg => "Memory '" . $self->{memory_selected}->{$id}->{display} . "' $long_msg [entity = '" . $self->{memory_selected}->{$id}->{name} . "']");
         my $exit = $self->{output}->get_most_critical(status => [ @exits ]);
         if (!$self->{output}->is_status(litteral => 1, value => $exit, compare => 'ok')) {
             $self->{output}->output_add(severity => $exit,