From 211fd1113e14688d632386814de62b5c89193510 Mon Sep 17 00:00:00 2001
From: garnier-quentin <qgarnier@centreon.com>
Date: Wed, 17 Jun 2015 09:22:37 +0200
Subject: [PATCH] + Fix extreme network modes (hardware and memory)

---
 network/extreme/snmp/mode/components/psu.pm  | 2 +-
 network/extreme/snmp/mode/components/slot.pm | 4 ++--
 network/extreme/snmp/mode/memory.pm          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/network/extreme/snmp/mode/components/psu.pm b/network/extreme/snmp/mode/components/psu.pm
index 859e5b946..c944ec1f6 100644
--- a/network/extreme/snmp/mode/components/psu.pm
+++ b/network/extreme/snmp/mode/components/psu.pm
@@ -57,7 +57,7 @@ my $oid_extremePowerSupplyEntry = '.1.3.6.1.4.1.1916.1.1.1.27.1';
 sub load {
     my (%options) = @_;
     
-    push @{$options{request}}, { oid => $oid_extremePowerSupplyEntry, end => $mapping->{extremePowerSupplyStatus}->{oid} };
+    push @{$options{request}}, { oid => $oid_extremePowerSupplyEntry, start => $mapping->{extremePowerSupplyStatus}->{oid} };
 }
 
 sub check_fan_speed {
diff --git a/network/extreme/snmp/mode/components/slot.pm b/network/extreme/snmp/mode/components/slot.pm
index 684059a6f..fef3e51f3 100644
--- a/network/extreme/snmp/mode/components/slot.pm
+++ b/network/extreme/snmp/mode/components/slot.pm
@@ -65,7 +65,7 @@ my $oid_extremeSlotEntry = '.1.3.6.1.4.1.1916.1.1.2.2.1';
 sub load {
     my (%options) = @_;
     
-    push @{$options{request}}, { oid => $oid_extremeSlotEntry, end => $mapping->{extremeSlotName}->{oid} };
+    push @{$options{request}}, { oid => $oid_extremeSlotEntry, start => $mapping->{extremeSlotName}->{oid}, end => $mapping->{extremeSlotModuleState}->{oid} };
 }
 
 sub check {
@@ -89,7 +89,7 @@ sub check {
         $self->{components}->{slot}->{total}++;
         $self->{output}->output_add(long_msg => sprintf("Slot '%s' status is '%s' [instance = %s]",
                                                         $result->{extremeSlotName}, $result->{extremeSlotModuleState}, $instance));
-        my $exit = $self->get_severity(section => 'psu', value => $result->{extremeSlotModuleState});
+        my $exit = $self->get_severity(section => 'slot', value => $result->{extremeSlotModuleState});
         if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
             $self->{output}->output_add(severity => $exit,
                                        short_msg => sprintf("Slot '%s' status is '%s'", $result->{extremeSlotName}, $result->{extremeSlotModuleState}));
diff --git a/network/extreme/snmp/mode/memory.pm b/network/extreme/snmp/mode/memory.pm
index bf5d77726..c50e56ec6 100644
--- a/network/extreme/snmp/mode/memory.pm
+++ b/network/extreme/snmp/mode/memory.pm
@@ -94,7 +94,7 @@ sub custom_usage_calc {
 
     $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'};
     $self->{result_values}->{total} = $options{new_datas}->{$self->{instance} . '_total'};
-    $self->{result_values}->{used} = $options{new_datas}->{$self->{instance} . '_total'} + $options{new_datas}->{$self->{instance} . '_free'};
+    $self->{result_values}->{used} = $options{new_datas}->{$self->{instance} . '_total'} - $options{new_datas}->{$self->{instance} . '_free'};
     $self->{result_values}->{free} = $options{new_datas}->{$self->{instance} . '_free'};
     $self->{result_values}->{prct_free} = $self->{result_values}->{free} * 100 / $self->{result_values}->{total};
     $self->{result_values}->{prct_used} = $self->{result_values}->{used} * 100 / $self->{result_values}->{total};