add GUI for GlusterFS storage

diff --git a/www/manager/Makefile b/www/manager/Makefile
index 90660dbf09660165e062765f1e02bd1b97ff6862..fa0b585809e026085c5dc3b61d6a65c08ce9502c 100644 (file)
--- a/www/manager/Makefile
+++ b/www/manager/Makefile
@@ -129,6 +129,7 @@ JSSRC=                                                      \
        storage/Browser.js                              \
        storage/DirEdit.js                              \
        storage/NFSEdit.js                              \
+       storage/GlusterFsEdit.js                        \
        storage/IScsiEdit.js                            \
        storage/LVMEdit.js                              \
        storage/RBDEdit.js                              \

diff --git a/www/manager/Utils.js b/www/manager/Utils.js
index 5f5a04c4004a905de9408e5259c306e34f1af47e..6fd70361decdb4e9314cb6b5004d5fe450ad0b75 100644 (file)
--- a/www/manager/Utils.js
+++ b/www/manager/Utils.js
@@ -674,6 +674,8 @@ Ext.define('PVE.Utils', { statics: {
            return 'Directory';
        } else if (value === 'nfs') {
            return 'NFS';
+       } else if (value === 'glusterfs') {
+           return 'GlusterFS';
        } else if (value === 'lvm') {
            return 'LVM';
        } else if (value === 'iscsi') {

diff --git a/www/manager/dc/StorageView.js b/www/manager/dc/StorageView.js
index 2c81c0be6e082bead7600bc43a7dcbe6aa4f5616..ee59df63cb347fba40ec842272dff43deb9022f9 100644 (file)
--- a/www/manager/dc/StorageView.js
+++ b/www/manager/dc/StorageView.js
@@ -36,6 +36,8 @@ Ext.define('PVE.dc.StorageView', {
                editor = 'PVE.storage.DirEdit';
            } else if (type === 'nfs') {
                editor = 'PVE.storage.NFSEdit';
+           } else if (type === 'glusterfs') {
+               editor = 'PVE.storage.GlusterFsEdit';
            } else if (type === 'lvm') {
                editor = 'PVE.storage.LVMEdit';
            } else if (type === 'iscsi') {
@@ -135,6 +137,15 @@ Ext.define('PVE.dc.StorageView', {
                                    win.show();
                                }
                            },
+                           {
+                               text: 'GlusterFS volume',
+                               iconCls: 'pve-itype-icon-node',
+                               handler: function() {
+                                   var win = Ext.create('PVE.storage.GlusterFsEdit', {});
+                                   win.on('destroy', reload);
+                                   win.show();
+                               }
+                           },
                            {
                                text: 'RBD',
                                iconCls: 'pve-itype-icon-node',

diff --git a/www/manager/storage/GlusterFsEdit.js b/www/manager/storage/GlusterFsEdit.js
new file mode 100644 (file)
index 0000000..d19549e
--- /dev/null
+++ b/www/manager/storage/GlusterFsEdit.js
@@ -0,0 +1,211 @@
+Ext.define('PVE.storage.GlusterFsScan', {
+    extend: 'Ext.form.field.ComboBox',
+    alias: 'widget.pveGlusterFsScan',
+
+    queryParam: 'server',
+
+    doRawQuery: function() {
+    },
+
+    onTriggerClick: function() {
+       var me = this;
+
+       if (!me.queryCaching || me.lastQuery !== me.glusterServer) {
+           me.store.removeAll();
+       }
+
+       me.allQuery = me.glusterServer;
+
+       me.callParent();
+    },
+
+    setServer: function(server) {
+       var me = this;
+
+       me.glusterServer = server;
+    },
+
+    initComponent : function() {
+       var me = this;
+
+       if (!me.nodename) {
+           me.nodename = 'localhost';
+       }
+
+       var store = Ext.create('Ext.data.Store', {
+           fields: [ 'volname' ],
+           proxy: {
+               type: 'pve',
+               url: '/api2/json/nodes/' + me.nodename + '/scan/glusterfs'
+           }
+       });
+
+       Ext.apply(me, {
+           store: store,
+           valueField: 'volname',
+           displayField: 'volname',
+           matchFieldWidth: false,
+           listConfig: {
+               loadingText: 'Scanning...',
+               listeners: {
+                   // hack: call setHeight to show scroll bars correctly
+                   refresh: function(list) {
+                       var lh = PVE.Utils.gridLineHeigh();
+                       var count = store.getCount();
+                       list.setHeight(lh * ((count > 10) ? 10 : count));
+                   }
+               },
+               width: 350
+           }
+       });
+
+       me.callParent();
+    }
+});
+
+Ext.define('PVE.storage.GlusterFsInputPanel', {
+    extend: 'PVE.panel.InputPanel',
+
+    onGetValues: function(values) {
+       var me = this;
+
+       if (me.create) {
+           values.type = 'glusterfs';
+       } else {
+           delete values.storage;
+       }
+
+       values.disable = values.enable ? 0 : 1;     
+       delete values.enable;
+       
+       return values;
+    },
+
+    initComponent : function() {
+       var me = this;
+
+
+       me.column1 = [
+           {
+               xtype: me.create ? 'textfield' : 'displayfield',
+               name: 'storage',
+               height: 22, // hack: set same height as text fields
+               value: me.storageId || '',
+               fieldLabel: 'ID',
+               vtype: 'StorageId',
+               allowBlank: false
+           },
+           {
+               xtype: me.create ? 'textfield' : 'displayfield',
+               height: 22, // hack: set same height as text fields
+               name: 'server',
+               value: '',
+               fieldLabel: gettext('Server'),
+               allowBlank: false,
+               listeners: {
+                   change: function(f, value) {
+                       if (me.create) {
+                           var volumeField = me.down('field[name=volume]');
+                           volumeField.setServer(value);
+                           volumeField.setValue('');
+                       }
+                   }
+               }
+           },
+           {
+               xtype: me.create ? 'pveGlusterFsScan' : 'displayfield',
+               height: 22, // hack: set same height as text fields
+               name: 'volume',
+               value: '',
+               fieldLabel: 'Volume name',
+               allowBlank: false
+           },
+           {
+               xtype: 'pveContentTypeSelector',
+               name: 'content',
+               value: 'images',
+               multiSelect: true,
+               fieldLabel: gettext('Content'),
+               allowBlank: false
+           }
+       ];
+
+       me.column2 = [
+           {
+               xtype: 'PVE.form.NodeSelector',
+               name: 'nodes',
+               fieldLabel: gettext('Nodes'),
+               emptyText: gettext('All') + ' (' + 
+                   gettext('No restrictions') +')',
+               multiSelect: true,
+               autoSelect: false
+           },
+           {
+               xtype: 'pvecheckbox',
+               name: 'enable',
+               checked: true,
+               uncheckedValue: 0,
+               fieldLabel: gettext('Enable')
+           },
+           {
+               xtype: 'numberfield',
+               fieldLabel: gettext('Max Backups'),
+               name: 'maxfiles',
+               minValue: 0,
+               maxValue: 365,
+               value: me.create ? '1' : undefined,
+               allowBlank: false
+           }
+       ];
+
+       me.callParent();
+    }
+});
+
+Ext.define('PVE.storage.GlusterFsEdit', {
+    extend: 'PVE.window.Edit',
+
+    initComponent : function() {
+       var me = this;
+ 
+       me.create = !me.storageId;
+
+       if (me.create) {
+            me.url = '/api2/extjs/storage';
+            me.method = 'POST';
+        } else {
+            me.url = '/api2/extjs/storage/' + me.storageId;
+            me.method = 'PUT';
+        }
+
+       var ipanel = Ext.create('PVE.storage.GlusterFsInputPanel', {
+           create: me.create,
+           storageId: me.storageId
+       });
+       
+       Ext.apply(me, {
+            subject: 'GlusterFS Volume',
+           isAdd: true,
+           items: [ ipanel ]
+       });
+
+       me.callParent();
+
+       if (!me.create) {
+           me.load({
+               success:  function(response, options) {
+                   var values = response.result.data;
+                   var ctypes = values.content || '';
+
+                   values.content = ctypes.split(',');
+
+                   if (values.nodes) {
+                       values.nodes = values.nodes.split(',');
+                   }
+                   values.enable = values.disable ? 0 : 1;
+                   ipanel.setValues(values);
+               }
+           });
+       }
+    }
+});