Add filter fo storage

Negashev · Mar 25, 2024 · f36129f · f36129f
1 parent 4b657c0
commit f36129f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rancher-vcloud-director-node-driver-ui-plugin",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "private": false,
   "engines": {
     "node": ">=12"

diff --git a/pkg/vcd-node-driver/package.json b/pkg/vcd-node-driver/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vcd-node-driver",
   "description": "vCloud Director node-driver plugin for rancher",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "private": false,
   "rancher": {
     "annotations": {

diff --git a/pkg/vcd-node-driver/vcd.ts b/pkg/vcd-node-driver/vcd.ts
@@ -96,7 +96,11 @@ export class Vcd {
     }
 
     public async getStorage(value: any, initial?: string) {
-      return await this.getOptions(value, '/query?type=orgVdcStorageProfile&pageSize=1000', 'record', undefined, initial);
+      return await this.getOptions(value, '/query?type=orgVdcStorageProfile&pageSize=1000', 'record', (storage: any) => {
+        if (storage.vdcName === this.vdc) {
+          return storage;
+        }
+      }, initial);
     }
 
     public async getVAppVms(value: any, api: string, initial?: string) {
@@ -233,7 +237,7 @@ export class Vcd {
     private convertToOptions(list: any) {
       const sorted = (list || []).sort((a: any, b: any) => a.name.localeCompare(b.name));
 
-      return sorted.map((p: any) => {
+      return sorted.filter(item => item !== undefined).map((p: any) => {
         return {
           label: p.name,
           value: p