From da7395fc8ff13e16f0f562faabb94ce14ffb59eb Mon Sep 17 00:00:00 2001
From: Quentin Garnier <qgarnier@merethis.com>
Date: Mon, 9 Jun 2014 10:07:21 +0200
Subject: [PATCH] Refs #5597

---
 storage/emc/recoverypoint/ssh/mode/monitoredparameters.pm | 7 +++----
 storage/emc/recoverypoint/ssh/mode/systemstatus.pm        | 1 -
 storage/emc/recoverypoint/ssh/plugin.pm                   | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/storage/emc/recoverypoint/ssh/mode/monitoredparameters.pm b/storage/emc/recoverypoint/ssh/mode/monitoredparameters.pm
index c6dee4a6b..b0261bc79 100644
--- a/storage/emc/recoverypoint/ssh/mode/monitoredparameters.pm
+++ b/storage/emc/recoverypoint/ssh/mode/monitoredparameters.pm
@@ -59,10 +59,9 @@ sub new {
                                   "command-path:s"    => { name => 'command_path' },
                                   "command-options:s" => { name => 'command_options', default => '' },
                                   "min-severity:s"    => { name => 'min_severity', default => 'minor' },
-                                  "warning:s"         => { name => 'warning', },
-                                  "critical:s"        => { name => 'critical', },
+                                  "warning:s"         => { name => 'warning' },
+                                  "critical:s"        => { name => 'critical' },
                                 });
-    $self->{manage_returns} = {};
     return $self;
 }
 
@@ -88,7 +87,7 @@ sub check_options {
        $self->{output}->add_option_msg(short_msg => "Wrong critical threshold '" . $self->{option_results}->{critical} . "'.");
        $self->{output}->option_exit();
     }
-    if (($self->{option_results}->{min_severity} !~ /minor/m) && ($self->{option_results}->{min_severity} !~ /major/m) && ($self->{option_results}->{min_severity} !~ /critical/m)) {
+    if ($self->{option_results}->{min_severity} !~ /^(minor|major|critical)$/) {
         $self->{output}->add_option_msg(short_msg => 'Min-severity must be minor, major or critical.');
         $self->{output}->option_exit();
     } 
diff --git a/storage/emc/recoverypoint/ssh/mode/systemstatus.pm b/storage/emc/recoverypoint/ssh/mode/systemstatus.pm
index e433c62ef..bb97ed9f9 100644
--- a/storage/emc/recoverypoint/ssh/mode/systemstatus.pm
+++ b/storage/emc/recoverypoint/ssh/mode/systemstatus.pm
@@ -59,7 +59,6 @@ sub new {
                                   "command-path:s"    => { name => 'command_path' },
                                   "command-options:s" => { name => 'command_options', default => 'category=system summary=yes' },
                                 });
-    $self->{manage_returns} = {};
     return $self;
 }
 
diff --git a/storage/emc/recoverypoint/ssh/plugin.pm b/storage/emc/recoverypoint/ssh/plugin.pm
index 5ae782624..4f721b889 100644
--- a/storage/emc/recoverypoint/ssh/plugin.pm
+++ b/storage/emc/recoverypoint/ssh/plugin.pm
@@ -47,8 +47,8 @@ sub new {
 
     $self->{version} = '0.1';
     %{$self->{modes}} = (
-                         'system-status'    => 'storage::emc::recoverypoint::ssh::mode::systemstatus',
-                         'monitored-parameters'    => 'storage::emc::recoverypoint::ssh::mode::monitoredparameters',
+                         'system-status'        => 'storage::emc::recoverypoint::ssh::mode::systemstatus',
+                         'monitored-parameters' => 'storage::emc::recoverypoint::ssh::mode::monitoredparameters',
                          );
 
     return $self;