NetInventory PROLOG answer optimization (#451)

* feat: Skip netinventory option with no data in XML response to PROLOG * feat: Limit provided credentials to only the used one for netinventory * test: Fix unittest
glpi-project · Dec 12, 2023 · 2db75a1 · 2db75a1
1 parent 8a2742b
commit 2db75a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/inc/networkinventory.class.php b/inc/networkinventory.class.php
@@ -384,6 +384,8 @@ public function run($jobstate)
                 1,
                 "Device have no ip"
             );
+            // Return an empty list to avoid adding an option with no data in the joblist
+            return [];
         } else {
            // Use general config when threads number is set to 0 on the agent
             $param_attrs['THREADS_QUERY'] = $agent->fields["threads_networkinventory"] == 0 ?
@@ -435,7 +437,8 @@ public function run($jobstate)
                     "Merged with " . $changestate
                 );
             }
-            $snmpauthlist = $credentials->find();
+            // Only keep required snmp credentials
+            $snmpauthlist = $credentials->find(['id' => $a_extended['snmpcredentials_id']]);
             foreach ($snmpauthlist as $snmpauth) {
                 $auth_node = $pfToolbox->addAuth($snmpauth['id']);
                 if (count($auth_node)) {

diff --git a/tests/Integration/Tasks/NetworkInventoryTest.php b/tests/Integration/Tasks/NetworkInventoryTest.php
@@ -437,12 +437,6 @@ public function PrinterToInventoryWithIp()
                   'IP'          => '192.168.200.124',
                   'AUTHSNMP_ID' => 2
                ]
-            ], [
-               'AUTHENTICATION' => [
-                  'ID'        => 1,
-                  'VERSION'   => 1,
-                  'COMMUNITY' => 'public'
-               ]
             ], [
                'AUTHENTICATION' => [
                   'ID'        => 2,