feat: Run esx inventory after esx discovery

glpi-project · Oct 3, 2023 · 93f341a · 93f341a
1 parent 56acce5
commit 93f341a
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/lib/GLPI/Agent/Task/NetDiscovery.pm b/lib/GLPI/Agent/Task/NetDiscovery.pm
@@ -430,15 +430,19 @@ sub run {
                         $inventory->run();
 
                     } elsif ($authremote) {
-                        my $credentials = [
-                            grep { $_->{ID} eq $authremote } @{$jobaddress->{remote_credentials}}
-                        ];
-                        if ($credentials->{TYPE} eq 'esx') {
-                            # As we still have run the connection part in _scanAddressByRemote(), we reuse the connected object
-                            $esxscan->serverInventory();
-                        } else {
-                            GLPI::Agent::Task::RemoteInventory->require();
-                            # TODO Support RemoteInventory task run
+                        my $credentials = first { $_->{ID} eq $authremote } @{$jobaddress->{remote_credentials}};
+                        if ($credentials) {
+                            my $path;
+                            $path = $self->{target}->getPath() if $self->{target}->isType('local');
+                            # When target path is agent folder, inventory should be saved in inventory subfolder
+                            $path .= '/inventory' if $path eq '.';
+                            if ($credentials->{TYPE} eq 'esx' && $esxscan) {
+                                # As we still have run the connection part in _scanAddressByRemote(), we reuse the connected object
+                                $esxscan->serverInventory($path);
+                            } else {
+                                GLPI::Agent::Task::RemoteInventory->require();
+                                # TODO Support RemoteInventory task run
+                            }
                         }
                     }