fix #1691: use asynchronous API call for HD create

[pve-manager.git] / www / manager6 / Utils.js

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 6345b2b487cd780eb8dab957885b04ddf8f6ec1a..af03958c58aa6bad26fda30f8b6f5e221edff021 100644 (file)
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -10,7 +10,6 @@ Ext.enableAriaPanels = false;
 // avoid errors when running without development tools
 if (!Ext.isDefined(Ext.global.console)) {
     var console = {
-       dir: function() {},
        log: function() {}
     };
 }
@@ -383,43 +382,90 @@ Ext.define('PVE.Utils', { utilities: {
     isoImageText: gettext('ISO image'),
     containersText: gettext('Container'),
 
+    storageSchema: {
+       dir: {
+           name: Proxmox.Utils.directoryText,
+           ipanel: 'DirInputPanel',
+           faIcon: 'folder'
+       },
+       lvm: {
+           name: 'LVM',
+           ipanel: 'LVMInputPanel',
+           faIcon: 'folder'
+       },
+       lvmthin: {
+           name: 'LVM-Thin',
+           ipanel: 'LvmThinInputPanel',
+           faIcon: 'folder'
+       },
+       nfs: {
+           name: 'NFS',
+           ipanel: 'NFSInputPanel',
+           faIcon: 'building'
+       },
+       cifs: {
+           name: 'CIFS',
+           ipanel: 'CIFSInputPanel',
+           faIcon: 'building'
+       },
+       glusterfs: {
+           name: 'GlusterFS',
+           ipanel: 'GlusterFsInputPanel',
+           faIcon: 'building'
+       },
+       iscsi: {
+           name: 'iSCSI',
+           ipanel: 'IScsiInputPanel',
+           faIcon: 'building'
+       },
+       sheepdog: {
+           name: 'Sheepdog',
+           ipanel: 'SheepdogInputPanel',
+           hideAdd: true,
+           faIcon: 'building'
+       },
+       rbd: {
+           name: 'RBD',
+           ipanel: 'RBDInputPanel',
+           hideAdd: true,
+           faIcon: 'building'
+       },
+       rbd_ext: {
+           name: 'RBD (external)',
+           ipanel: 'RBDInputPanel',
+           faIcon: 'building'
+       },
+       pveceph: {
+           name: 'RBD (PVE)',
+           ipanel: 'PVERBDInputPanel',
+           faIcon: 'building'
+       },
+       zfs: {
+           name: 'ZFS over iSCSI',
+           ipanel: 'ZFSInputPanel',
+           faIcon: 'building'
+       },
+       zfspool: {
+           name: 'ZFS',
+           ipanel: 'ZFSPoolInputPanel',
+           faIcon: 'folder'
+       },
+       drbd: {
+           name: 'DRBD',
+           hideAdd: true
+       }
+    },
+
     format_storage_type: function(value, md, record) {
        if (value === 'rbd' && record) {
            value = (record.get('monhost')?'rbd_ext':'pveceph');
        }
-       if (value === 'dir') {
-           return Proxmox.Utils.directoryText;
-       } else if (value === 'nfs') {
-           return 'NFS';
-       } else if (value === 'cifs') {
-           return 'CIFS';
-       } else if (value === 'glusterfs') {
-           return 'GlusterFS';
-       } else if (value === 'lvm') {
-           return 'LVM';
-       } else if (value === 'lvmthin') {
-           return 'LVM-Thin';
-       } else if (value === 'iscsi') {
-           return 'iSCSI';
-       } else if (value === 'rbd') {
-           return 'RBD';
-       } else if (value === 'rbd_ext') {
-           return 'RBD (external)';
-       } else if (value === 'pveceph') {
-           return 'RBD (PVE)';
-       } else if (value === 'sheepdog') {
-           return 'Sheepdog';
-       } else if (value === 'zfs') {
-           return 'ZFS over iSCSI';
-       } else if (value === 'zfspool') {
-           return 'ZFS';
-       } else if (value === 'iscsidirect') {
-           return 'iSCSIDirect';
-       } else if (value === 'drbd') {
-           return 'DRBD';
-       } else {
-           return Proxmox.Utils.unknownText;
+
+       var schema = PVE.Utils.storageSchema[value];
+       if (schema) {
+           return schema.name;
        }
+       return Proxmox.Utils.unknownText;
     },
 
     format_ha: function(value) {
@@ -917,6 +963,29 @@ Ext.define('PVE.Utils', { utilities: {
                }
            }
        }
+    },
+
+    mp_counts: { mps: 10, unused: 10 },
+
+    forEachMP: function(func, includeUnused) {
+       var i, cont;
+       for (i = 0; i < PVE.Utils.mp_counts.mps; i++) {
+           cont = func('mp', i);
+           if (!cont && cont !== undefined) {
+               return;
+           }
+       }
+
+       if (!includeUnused) {
+           return;
+       }
+
+       for (i = 0; i < PVE.Utils.mp_counts.unused; i++) {
+           cont = func('unused', i);
+           if (!cont && cont !== undefined) {
+               return;
+           }
+       }
     }
 },