Signed-off-by: Alexandre Derumier <[email protected]>
---
www/manager/Makefile | 1 -
www/manager/Utils.js | 2 -
www/manager/dc/StorageView.js | 11 ---
www/manager/qemu/Clone.js | 3 +-
www/manager/qemu/HDEdit.js | 1 -
www/manager/qemu/HDMove.js | 3 +-
www/manager/storage/NexentaEdit.js | 164 ------------------------------------
7 files changed, 2 insertions(+), 183 deletions(-)
delete mode 100644 www/manager/storage/NexentaEdit.js
diff --git a/www/manager/Makefile b/www/manager/Makefile
index 6b85683..46c8a32 100644
--- a/www/manager/Makefile
+++ b/www/manager/Makefile
@@ -134,7 +134,6 @@ JSSRC=
\
storage/LVMEdit.js \
storage/RBDEdit.js \
storage/SheepdogEdit.js \
- storage/NexentaEdit.js \
storage/ZFSEdit.js \
dc/Summary.js \
dc/OptionView.js \
diff --git a/www/manager/Utils.js b/www/manager/Utils.js
index e730c6b..001f0af 100644
--- a/www/manager/Utils.js
+++ b/www/manager/Utils.js
@@ -690,8 +690,6 @@ Ext.define('PVE.Utils', { statics: {
return 'RBD';
} else if (value === 'sheepdog') {
return 'Sheepdog';
- } else if (value === 'nexenta') {
- return 'Nexenta';
} else if (value === 'zfs') {
return 'ZFS';
} else if (value === 'iscsidirect') {
diff --git a/www/manager/dc/StorageView.js b/www/manager/dc/StorageView.js
index 03d8b6c..d957a26 100644
--- a/www/manager/dc/StorageView.js
+++ b/www/manager/dc/StorageView.js
@@ -46,8 +46,6 @@ Ext.define('PVE.dc.StorageView', {
editor = 'PVE.storage.RBDEdit';
} else if (type === 'sheepdog') {
editor = 'PVE.storage.SheepdogEdit';
- } else if (type === 'nexenta') {
- editor = 'PVE.storage.NexentaEdit';
} else if (type === 'zfs') {
editor = 'PVE.storage.ZFSEdit';
} else {
@@ -169,15 +167,6 @@ Ext.define('PVE.dc.StorageView', {
}
},
{
- text: PVE.Utils.format_storage_type('nexenta'),
- iconCls: 'pve-itype-icon-node',
- handler: function() {
- var win =
Ext.create('PVE.storage.NexentaEdit', {});
- win.on('destroy', reload);
- win.show();
- }
- },
- {
text: PVE.Utils.format_storage_type('zfs'),
iconCls: 'pve-itype-icon-node',
handler: function() {
diff --git a/www/manager/qemu/Clone.js b/www/manager/qemu/Clone.js
index 5501a52..3409c85 100644
--- a/www/manager/qemu/Clone.js
+++ b/www/manager/qemu/Clone.js
@@ -69,8 +69,7 @@ Ext.define('PVE.window.Clone', {
rec.data.type === 'rbd' ||
rec.data.type === 'iscsi' ||
rec.data.type === 'sheepdog' ||
- rec.data.type === 'nexenta' ||
- rec.data.type === 'zfs'
+ rec.data.type === 'zfs'
) {
me.formatsel.setValue('raw');
me.formatsel.setDisabled(true);
diff --git a/www/manager/qemu/HDEdit.js b/www/manager/qemu/HDEdit.js
index fc9dae8..af5427a 100644
--- a/www/manager/qemu/HDEdit.js
+++ b/www/manager/qemu/HDEdit.js
@@ -192,7 +192,6 @@ Ext.define('PVE.qemu.HDInputPanel', {
} else if (rec.data.type === 'lvm' ||
rec.data.type === 'rbd' ||
rec.data.type === 'sheepdog' ||
- rec.data.type === 'nexenta' ||
rec.data.type === 'zfs') {
me.hdfilesel.setDisabled(true);
me.hdfilesel.setVisible(false);
diff --git a/www/manager/qemu/HDMove.js b/www/manager/qemu/HDMove.js
index d4baf22..53a9aae 100644
--- a/www/manager/qemu/HDMove.js
+++ b/www/manager/qemu/HDMove.js
@@ -76,8 +76,7 @@ Ext.define('PVE.window.HDMove', {
me.formatsel.setDisabled(true);
} else if (rec.data.type === 'lvm' ||
rec.data.type === 'rbd' ||
- rec.data.type === 'sheepdog' ||
- rec.data.type === 'nexenta'
+ rec.data.type === 'sheepdog'
) {
me.formatsel.setValue('raw');
me.formatsel.setDisabled(true);
diff --git a/www/manager/storage/NexentaEdit.js
b/www/manager/storage/NexentaEdit.js
deleted file mode 100644
index 4dce29e..0000000
--- a/www/manager/storage/NexentaEdit.js
+++ /dev/null
@@ -1,164 +0,0 @@
-Ext.define('PVE.storage.NexentaInputPanel', {
- extend: 'PVE.panel.InputPanel',
-
- onGetValues: function(values) {
- var me = this;
-
- if (me.create) {
- values.type = 'nexenta';
- values.content = 'images';
-
- } else {
- delete values.storage;
- }
-
- values.disable = values.enable ? 0 : 1;
- delete values.enable;
-
- values.ssl = values.enablessl ? 1 : 0;
- delete values.enablessl;
-
- 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',
- name: 'portal',
- height: 22, // hack: set same height as text fields
- value: '',
- fieldLabel: gettext('Portal'),
- allowBlank: false
- },
- {
- xtype: me.create ? 'textfield' : 'displayfield',
- name: 'target',
- height: 22, // hack: set same height as text fields
- value: 'iqn.1986-03.com.sun:02:....',
- fieldLabel: gettext('Target'),
- allowBlank: false
- },
- {
- xtype: me.create ? 'textfield' : 'displayfield',
- name: 'pool',
- height: 22, // hack: set same height as text fields
- value: '',
- fieldLabel: gettext('Pool'),
- allowBlank: false
- },
- {
- xtype: me.create ? 'textfield' : 'displayfield',
- name: 'login',
- height: 22, // hack: set same height as text fields
- value: '',
- fieldLabel: gettext('Login'),
- allowBlank: false
- },
- {
- xtype: me.create ? 'textfield' : 'displayfield',
- name: 'password',
- height: 22, // hack: set same height as text fields
- value: '',
- fieldLabel: gettext('Password'),
- allowBlank: false
- }
- ];
-
- me.column2 = [
- {
- xtype: 'pvecheckbox',
- name: 'enable',
- checked: true,
- uncheckedValue: 0,
- fieldLabel: gettext('Enable')
- },
- {
- xtype: 'pvecheckbox',
- name: 'enablessl',
- checked: true,
- uncheckedValue: 0,
- fieldLabel: gettext('ssl')
- },
- {
- xtype: me.create ? 'textfield' : 'displayfield',
- name: 'blocksize',
- height: 22, // hack: set same height as text fields
- value: '4K',
- fieldLabel: gettext('Block Size'),
- allowBlank: false
- }
- ];
-
- if (me.create || me.storageId !== 'local') {
- me.column2.unshift({
- xtype: 'PVE.form.NodeSelector',
- name: 'nodes',
- fieldLabel: gettext('Nodes'),
- emptyText: gettext('All') + ' (' +
- gettext('No restrictions') +')',
- multiSelect: true,
- autoSelect: false
- });
- }
-
- me.callParent();
- }
-});
-
-Ext.define('PVE.storage.NexentaEdit', {
- 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.NexentaInputPanel', {
- create: me.create,
- storageId: me.storageId
- });
-
- Ext.apply(me, {
- subject: PVE.Utils.format_storage_type('nexenta'),
- isAdd: true,
- items: [ ipanel ]
- });
-
- me.callParent();
-
- if (!me.create) {
- me.load({
- success: function(response, options) {
- var values = response.result.data;
- if (values.nodes) {
- values.nodes = values.nodes.split(',');
- }
- values.enable = values.disable ? 0 : 1;
- values.enablessl = values.ssl ? 1 : 0;
- ipanel.setValues(values);
- }
- });
- }
- }
-});
--
1.7.10.4
_______________________________________________
pve-devel mailing list
[email protected]
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
