From 6f965849f9fcb330c20f253bf7101d1e763cc2bf Mon Sep 17 00:00:00 2001
From: garnier-quentin <garnier.quentin@gmail.com>
Date: Thu, 13 Jun 2019 14:26:36 +0200
Subject: [PATCH] update mrv optiswitch memory

---
 network/mrv/optiswitch/snmp/mode/memory.pm | 37 +++++++++++++---------
 snmp_standard/mode/memory.pm               |  2 +-
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/network/mrv/optiswitch/snmp/mode/memory.pm b/network/mrv/optiswitch/snmp/mode/memory.pm
index e835137a3..56a1df201 100644
--- a/network/mrv/optiswitch/snmp/mode/memory.pm
+++ b/network/mrv/optiswitch/snmp/mode/memory.pm
@@ -25,27 +25,34 @@ use base qw(snmp_standard::mode::memory);
 use strict;
 use warnings;
 
-sub custom_usage_calc {
+sub memory_calc {
     my ($self, %options) = @_;
 
-    $self->{result_values}->{total} = $options{new_datas}->{$self->{instance} . '_memTotalReal'};
-    $self->{result_values}->{free} = $options{new_datas}->{$self->{instance} . '_memTotalFree'};
-    $self->{result_values}->{buffer} = $options{new_datas}->{$self->{instance} . '_memBuffer'};
-    $self->{result_values}->{cached} = $options{new_datas}->{$self->{instance} . '_memCached'};
+    my $available = ($options{result}->{memTotalFree}) ? $options{result}->{memTotalFree} * 1024 : 0;
+    my $total = ($options{result}->{memTotalReal}) ? $options{result}->{memTotalReal} * 1024 : 0;
+    my $buffer = ($options{result}->{memBuffer}) ? $options{result}->{memBuffer} * 1024 : 0;
+    my $cached = ($options{result}->{memCached}) ? $options{result}->{memCached} * 1024 : 0;
+    my ($used, $free, $prct_used, $prct_free) = (0, 0, 0, 0);
 
-    if ($self->{result_values}->{total} != 0) {
-        $self->{result_values}->{physical_used} = $self->{result_values}->{total} - $self->{result_values}->{free};
-        $self->{result_values}->{used} = $self->{result_values}->{physical_used} - $self->{result_values}->{buffer} - $self->{result_values}->{cached};
-        $self->{result_values}->{prct_used} = $self->{result_values}->{used} * 100 / $self->{result_values}->{total};
-    } else {
-        $self->{result_values}->{used} = '0';
-        $self->{result_values}->{prct_used} = '0';
+    if ($total != 0) {
+        $used = $total - $available - $buffer - $cached;
+        $free = $total - $used;
+        $prct_used = $used * 100 / $total;
+        $prct_free = 100 - $prct_used;
     }
-
-    return 0;
+    
+    $self->{ram} = {
+        total => $total,
+        used => $used,
+        free => $free,
+        prct_used => $prct_used,
+        prct_free => $prct_free,
+        memShared => ($options{result}->{memShared}) ? $options{result}->{memShared} * 1024 : 0,
+        memBuffer => $buffer,
+        memCached => $cached,
+    };
 }
 
-
 1;
 
 __END__
diff --git a/snmp_standard/mode/memory.pm b/snmp_standard/mode/memory.pm
index 692e6c246..5ecca4051 100644
--- a/snmp_standard/mode/memory.pm
+++ b/snmp_standard/mode/memory.pm
@@ -53,7 +53,7 @@ sub set_counters {
     my ($self, %options) = @_;
 
     $self->{maps_counters_type} = [
-        { name => 'ram', type => 0 },
+        { name => 'ram', type => 0, skipped_code => { -10 => 1 } },
         { name => 'swap', type => 0, message_separator => ' - ', skipped_code => { -10 => 1 } },
     ];