fix(vmware-explorer/Esxi#search): handle more than 100 entries

Daniel-Furcht · Feb 27, 2023 · f5d19fd · f5d19fd
1 parent 24ac3ea
commit f5d19fd
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 20 deletions.
diff --git a/@xen-orchestra/vmware-explorer/esxi.mjs b/@xen-orchestra/vmware-explorer/esxi.mjs
@@ -124,29 +124,41 @@ export default class Esxi extends EventEmitter {
       objectSet: [objectSpec],
     }
 
-    result = await this.#exec('RetrievePropertiesEx', {
-      _this: propertyCollector,
-      specSet: [propertyFilterSpec],
-      options: { attributes: { type: 'RetrieveOptions' } },
-    })
-
+    let token
     const objects = {}
-    const returnObj = Array.isArray(result.returnval.objects) ? result.returnval.objects : [result.returnval.objects]
+    do {
+      if (token !== undefined) {
+        result = await this.#exec('ContinueRetrievePropertiesEx', {
+          _this: propertyCollector,
+          token,
+        })
+      } else {
+        result = await this.#exec('RetrievePropertiesEx', {
+          _this: propertyCollector,
+          specSet: [propertyFilterSpec],
+          options: { attributes: { type: 'RetrieveOptions' } },
+        })
+      }
 
-    returnObj.forEach(({ obj, propSet }) => {
-      objects[obj.$value] = {}
-      propSet = Array.isArray(propSet) ? propSet : [propSet]
-      propSet.forEach(({ name, val }) => {
-        // don't care about the type for now
-        delete val.attributes
-        // a scalar value : simplify it
-        if (val.$value) {
-          objects[obj.$value][name] = val.$value
-        } else {
-          objects[obj.$value][name] = val
-        }
+      const returnObj = Array.isArray(result.returnval.objects) ? result.returnval.objects : [result.returnval.objects]
+      returnObj.forEach(({ obj, propSet }) => {
+        objects[obj.$value] = {}
+        propSet = Array.isArray(propSet) ? propSet : [propSet]
+        propSet.forEach(({ name, val }) => {
+          // don't care about the type for now
+          delete val.attributes
+          // a scalar value : simplify it
+          if (val.$value) {
+            objects[obj.$value][name] = val.$value
+          } else {
+            objects[obj.$value][name] = val
+          }
+        })
       })
-    })
+
+      token = result.returnval.token
+    } while (token)
+
     return objects
   }
 

diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
@@ -18,6 +18,7 @@
 
 - [xo-cli] Fix `write EPIPE` error when used with piped output is closed (e.g. like `| head`) [#6680](https://github.com/vatesfr/xen-orchestra/issues/6680)
 - [VM] Show distro icon for openSUSE [Forum#6965](https://xcp-ng.org/forum/topic/6965)
+- [ESXI import] Handle listing more than 100 VMs
 
 ### Packages to release
 
@@ -35,6 +36,7 @@
 
 <!--packages-start-->
 
+- @xen-orchestra/vmware-explorer patch
 - @xen-orchestra/backups minor
 - xo-cli minor
 - xo-server-auth-oidc minor