fix: Fix wrong 'n/a' ko status report to tasks managed by GLPI Invent…

…ory plugin Closes glpi-project/glpi-inventory-plugin#456
glpi-project · Dec 20, 2023 · 4c1cad8 · 4c1cad8
1 parent b556f8a
commit 4c1cad8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/Changes b/Changes
@@ -51,6 +51,7 @@ netdiscovery/netinventory:
 esx:
 * Fix first connection timeout support
 * Added --timeout option support to glpi-esx
+* Fix wrong 'n/a' ko status report to tasks managed by GLPI Inventory plugin
 
 toolbox:
 * fix #533: Fix Toolbox export buttons in inventory results

diff --git a/lib/GLPI/Agent/SOAP/VMware.pm b/lib/GLPI/Agent/SOAP/VMware.pm
@@ -42,6 +42,12 @@ sub timeout {
     return $self->{ua}->timeout($timeout);
 }
 
+sub lastError {
+    my ($self) = @_;
+
+    return $self->{_lastError} // '';
+}
+
 sub _send {
     my ( $self, $action, $xmlToSend ) = @_;
 
@@ -69,7 +75,7 @@ sub _send {
         if ( $tmpRef && $tmpRef->{faultstring} ) {
             $errorString .= ": " . $tmpRef->{faultstring};
         }
-        $self->{lastError} = $errorString;
+        $self->{_lastError} = $errorString;
         return;
     }
 
@@ -116,13 +122,13 @@ sub connect {
     my ( $self, $user, $password ) = @_;
 
     unless ($user) {
-        $self->{lastError} = "No user".($self->{lastError} ? "" : " and password").
+        $self->{_lastError} = "No user".($self->{lastError} ? "" : " and password").
             " provided for ESX connection";
         return;
     }
 
     unless ($password) {
-        $self->{lastError} = "No password provided for ESX connection";
+        $self->{_lastError} = "No password provided for ESX connection";
         return;
     }
 

diff --git a/lib/GLPI/Agent/Task/ESX.pm b/lib/GLPI/Agent/Task/ESX.pm
@@ -40,7 +40,7 @@ sub connect {
         timeout => $self->timeout(),
     );
     if ( !$vpbs->connect( $params{user}, $params{password} ) ) {
-        $self->lastError($vpbs->{lastError});
+        $self->lastError($vpbs->lastError() || "Connection failure");
         return;
     }
 
@@ -330,9 +330,12 @@ sub serverInventory {
 sub lastError {
     my ($self, $error) = @_;
 
+    $self->{lastError} = $self->{esx}->lastError()
+        if $self->{esx};
+
     $self->{lastError} = $error if $error;
 
-    return $self->{lastError} || "n/a";
+    return $self->{lastError};
 }
 
 sub timeout {

diff --git a/lib/GLPI/Agent/Task/NetDiscovery.pm b/lib/GLPI/Agent/Task/NetDiscovery.pm
@@ -973,7 +973,6 @@ sub _scanAddressByRemote {
             } else {
                 $error = $esxscan->lastError();
                 my %errors = (
-                    'n/a'                    => '',
                     '405 Method Not Allowed' => 'not supporting VMWare SOAP API'
                 );
                 $error = $errors{$error} if $errors{$error};