From f6631a0351fc9391f18d205582cb3e202a5178ed Mon Sep 17 00:00:00 2001
From: Quentin Garnier <qgarnier@merethis.com>
Date: Fri, 12 Dec 2014 10:54:30 +0100
Subject: [PATCH] Fix #6017

---
 network/f5/bigip/mode/listnodes.pm          | 2 +-
 network/f5/bigip/mode/listpools.pm          | 2 +-
 network/f5/bigip/mode/listvirtualservers.pm | 2 +-
 snmp_standard/mode/diskio.pm                | 4 ++--
 snmp_standard/mode/listdiskspath.pm         | 4 ++--
 snmp_standard/mode/listinterfaces.pm        | 4 ++--
 snmp_standard/mode/liststorages.pm          | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/network/f5/bigip/mode/listnodes.pm b/network/f5/bigip/mode/listnodes.pm
index ba5a8bcda..6678fc6a6 100644
--- a/network/f5/bigip/mode/listnodes.pm
+++ b/network/f5/bigip/mode/listnodes.pm
@@ -120,7 +120,7 @@ sub disco_show {
     # $options{snmp} = snmp object
     $self->{snmp} = $options{snmp};
 
-    $self->manage_selection();
+    $self->manage_selection(disco => 1);
     foreach my $instance (sort @{$self->{node_id_selected}}) {        
         my $name = $self->{result_names}->{$oid_ltmNodeAddrStatusName . '.' . $instance};
         
diff --git a/network/f5/bigip/mode/listpools.pm b/network/f5/bigip/mode/listpools.pm
index df75badff..5887700e6 100644
--- a/network/f5/bigip/mode/listpools.pm
+++ b/network/f5/bigip/mode/listpools.pm
@@ -120,7 +120,7 @@ sub disco_show {
     # $options{snmp} = snmp object
     $self->{snmp} = $options{snmp};
 
-    $self->manage_selection();
+    $self->manage_selection(disco => 1);
     foreach my $instance (sort @{$self->{pool_id_selected}}) {        
         my $name = $self->{result_names}->{$oid_ltmPoolStatusName . '.' . $instance};
         
diff --git a/network/f5/bigip/mode/listvirtualservers.pm b/network/f5/bigip/mode/listvirtualservers.pm
index ff1480938..3356bc1ea 100644
--- a/network/f5/bigip/mode/listvirtualservers.pm
+++ b/network/f5/bigip/mode/listvirtualservers.pm
@@ -120,7 +120,7 @@ sub disco_show {
     # $options{snmp} = snmp object
     $self->{snmp} = $options{snmp};
 
-    $self->manage_selection();
+    $self->manage_selection(disco => 1);
     foreach my $instance (sort @{$self->{vs_id_selected}}) {        
         my $name = $self->{result_names}->{$oid_ltmVsStatusName . '.' . $instance};
         
diff --git a/snmp_standard/mode/diskio.pm b/snmp_standard/mode/diskio.pm
index a2d424b89..345cee624 100644
--- a/snmp_standard/mode/diskio.pm
+++ b/snmp_standard/mode/diskio.pm
@@ -279,7 +279,7 @@ sub manage_selection {
         }    
     }
     
-    if (scalar(keys %{$self->{device_id_selected}}) <= 0) {
+    if (scalar(keys %{$self->{device_id_selected}}) <= 0 && !defined($options{disco})) {
         if (defined($self->{option_results}->{device})) {
             $self->{output}->add_option_msg(short_msg => "No device found '" . $self->{option_results}->{device} . "' (or counter values are 0).");
         } else {
@@ -301,7 +301,7 @@ sub disco_show {
     # $options{snmp} = snmp object
     $self->{snmp} = $options{snmp};
     $self->{hostname} = $self->{snmp}->get_hostname();
-    $self->manage_selection();
+    $self->manage_selection(disco => 1);
     foreach (sort keys %{$self->{device_id_selected}}) {
         $self->{output}->add_disco_entry(name => $self->{results}->{$oid_diskIODevice}->{$oid_diskIODevice . '.' . $_},
                                          deviceid => $_);
diff --git a/snmp_standard/mode/listdiskspath.pm b/snmp_standard/mode/listdiskspath.pm
index 010311f21..a71272a1c 100644
--- a/snmp_standard/mode/listdiskspath.pm
+++ b/snmp_standard/mode/listdiskspath.pm
@@ -166,7 +166,7 @@ sub manage_selection {
             }
         }
         
-        if (scalar(@{$self->{diskpath_id_selected}}) <= 0) {
+        if (scalar(@{$self->{diskpath_id_selected}}) <= 0 && !defined($options{disco})) {
             if (defined($self->{option_results}->{diskpath})) {
                 $self->{output}->add_option_msg(short_msg => "No disk path found for name '" . $self->{option_results}->{diskpath} . "'.");
             } else {
@@ -188,7 +188,7 @@ sub disco_show {
     # $options{snmp} = snmp object
     $self->{snmp} = $options{snmp};
 
-    $self->manage_selection();
+    $self->manage_selection(disco => 1);
     my $result = $self->get_additional_information();
     foreach (sort @{$self->{diskpath_id_selected}}) {
         if (defined($result)) {
diff --git a/snmp_standard/mode/listinterfaces.pm b/snmp_standard/mode/listinterfaces.pm
index c1e7c67c0..f9be2b1e9 100644
--- a/snmp_standard/mode/listinterfaces.pm
+++ b/snmp_standard/mode/listinterfaces.pm
@@ -210,7 +210,7 @@ sub manage_selection {
             }
         }
         
-        if (scalar(@{$self->{interface_id_selected}}) <= 0) {
+        if (scalar(@{$self->{interface_id_selected}}) <= 0 && !defined($options{disco})) {
             if (defined($self->{option_results}->{interface})) {
                 $self->{output}->add_option_msg(short_msg => "No interface found for name '" . $self->{option_results}->{interface} . "'.");
             } else {
@@ -232,7 +232,7 @@ sub disco_show {
     # $options{snmp} = snmp object
     $self->{snmp} = $options{snmp};
 
-    $self->manage_selection();
+    $self->manage_selection(disco => 1);
     my $result = $self->get_additional_information();
     foreach (sort @{$self->{interface_id_selected}}) {
         my $display_value = $self->get_display_value(id => $_);
diff --git a/snmp_standard/mode/liststorages.pm b/snmp_standard/mode/liststorages.pm
index d7926e633..843baf1b3 100644
--- a/snmp_standard/mode/liststorages.pm
+++ b/snmp_standard/mode/liststorages.pm
@@ -224,7 +224,7 @@ sub manage_selection {
             }
         }
         
-        if (scalar(@{$self->{storage_id_selected}}) <= 0) {
+        if (scalar(@{$self->{storage_id_selected}}) <= 0 && !defined($options{disco})) {
             if (defined($self->{option_results}->{storage})) {
                 $self->{output}->add_option_msg(short_msg => "No storage found for name '" . $self->{option_results}->{storage} . "'.");
             } else {
@@ -246,7 +246,7 @@ sub disco_show {
     # $options{snmp} = snmp object
     $self->{snmp} = $options{snmp};
 
-    $self->manage_selection();
+    $self->manage_selection(disco => 1);
     my $result = $self->get_additional_information();
     foreach (sort @{$self->{storage_id_selected}}) {
         my $display_value = $self->get_display_value(id => $_);