192 lines
5.2 KiB
Diff
192 lines
5.2 KiB
Diff
--- pvemanagerlib-5.3-6.js 2018-12-21 12:54:58.650421078 -0500
|
|
+++ pvemanagerlib.js 2019-02-01 13:52:17.906074280 -0500
|
|
@@ -5894,6 +5894,7 @@
|
|
alias: ['widget.pveiScsiProviderSelector'],
|
|
comboItems: [
|
|
['comstar', 'Comstar'],
|
|
+ ['freenas', 'FreeNAS-API'],
|
|
[ 'istgt', 'istgt'],
|
|
[ 'iet', 'IET'],
|
|
[ 'LIO', 'LIO']
|
|
@@ -30085,6 +30086,7 @@
|
|
data: {
|
|
isLIO: false,
|
|
isComstar: true,
|
|
+ isFreeNAS: false,
|
|
hasWriteCacheOption: true
|
|
}
|
|
},
|
|
@@ -30097,10 +30099,26 @@
|
|
}
|
|
},
|
|
changeISCSIProvider: function(f, newVal, oldVal) {
|
|
+ var me = this;
|
|
var vm = this.getViewModel();
|
|
vm.set('isLIO', newVal === 'LIO');
|
|
vm.set('isComstar', newVal === 'comstar');
|
|
- vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'istgt');
|
|
+ vm.set('isFreeNAS', newVal === 'freenas');
|
|
+ vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'freenas' || newVal === 'istgt');
|
|
+ if (newVal !== 'freenas') {
|
|
+ me.lookupReference('freenas_use_ssl_field').setValue(false);
|
|
+ me.lookupReference('freenas_apiv4_host_field').setValue('');
|
|
+ me.lookupReference('freenas_user_field').setValue('');
|
|
+ me.lookupReference('freenas_user_field').allowBlank = true;
|
|
+ me.lookupReference('freenas_password_field').setValue('');
|
|
+ me.lookupReference('freenas_password_field').allowBlank = true;
|
|
+ me.lookupReference('freenas_confirmpw_field').setValue('');
|
|
+ me.lookupReference('freenas_confirmpw_field').allowBlank = true;
|
|
+ } else {
|
|
+ me.lookupReference('freenas_user_field').allowBlank = false;
|
|
+ me.lookupReference('freenas_password_field').allowBlank = false;
|
|
+ me.lookupReference('freenas_confirmpw_field').allowBlank = false;
|
|
+ }
|
|
}
|
|
},
|
|
|
|
@@ -30118,6 +30136,7 @@
|
|
},
|
|
|
|
setValues: function diff(values) {
|
|
+ values.freenas_confirmpw = values.freenas_password;
|
|
values.writecache = values.nowritecache ? 0 : 1;
|
|
this.callParent([values]);
|
|
},
|
|
@@ -30134,7 +30153,7 @@
|
|
allowBlank: false
|
|
},
|
|
{
|
|
- xtype: me.isCreate ? 'textfield' : 'displayfield',
|
|
+ xtype: 'textfield',
|
|
name: 'pool',
|
|
value: '',
|
|
fieldLabel: gettext('Pool'),
|
|
@@ -30144,11 +30163,11 @@
|
|
xtype: me.isCreate ? 'textfield' : 'displayfield',
|
|
name: 'blocksize',
|
|
value: '4k',
|
|
- fieldLabel: gettext('Block Size'),
|
|
+ fieldLabel: gettext('ZFS Block Size'),
|
|
allowBlank: false
|
|
},
|
|
{
|
|
- xtype: me.isCreate ? 'textfield' : 'displayfield',
|
|
+ xtype: 'textfield',
|
|
name: 'target',
|
|
value: '',
|
|
fieldLabel: gettext('Target'),
|
|
@@ -30159,8 +30178,33 @@
|
|
name: 'comstar_tg',
|
|
value: '',
|
|
fieldLabel: gettext('Target group'),
|
|
- bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' },
|
|
+ bind: {
|
|
+ hidden: '{!isComstar}'
|
|
+ },
|
|
allowBlank: true
|
|
+ },
|
|
+ {
|
|
+ xtype: 'proxmoxcheckbox',
|
|
+ name: 'freenas_use_ssl',
|
|
+ reference: 'freenas_use_ssl_field',
|
|
+ inputId: 'freenas_use_ssl_field',
|
|
+ checked: false,
|
|
+ bind: {
|
|
+ hidden: '{!isFreeNAS}'
|
|
+ },
|
|
+ uncheckedValue: 0,
|
|
+ fieldLabel: gettext('API use SSL')
|
|
+ },
|
|
+ {
|
|
+ xtype: 'textfield',
|
|
+ name: 'freenas_user',
|
|
+ reference: 'freenas_user_field',
|
|
+ inputId: 'freenas_user_field',
|
|
+ value: '',
|
|
+ fieldLabel: gettext('API Username'),
|
|
+ bind: {
|
|
+ hidden: '{!isFreeNAS}'
|
|
+ }
|
|
}
|
|
];
|
|
|
|
@@ -30191,7 +30235,9 @@
|
|
xtype: me.isCreate ? 'textfield' : 'displayfield',
|
|
name: 'comstar_hg',
|
|
value: '',
|
|
- bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' },
|
|
+ bind: {
|
|
+ hidden: '{!isComstar}'
|
|
+ },
|
|
fieldLabel: gettext('Host group'),
|
|
allowBlank: true
|
|
},
|
|
@@ -30199,9 +30245,64 @@
|
|
xtype: me.isCreate ? 'textfield' : 'displayfield',
|
|
name: 'lio_tpg',
|
|
value: '',
|
|
- bind: me.isCreate ? { disabled: '{!isLIO}' } : { hidden: '{!isLIO}' },
|
|
- allowBlank: false,
|
|
- fieldLabel: gettext('Target portal group')
|
|
+ bind: {
|
|
+ hidden: '{!isLIO}'
|
|
+ },
|
|
+ fieldLabel: gettext('Target portal group'),
|
|
+ allowBlank: true
|
|
+ },
|
|
+ {
|
|
+ xtype: 'proxmoxtextfield',
|
|
+ name: 'freenas_apiv4_host',
|
|
+ reference: 'freenas_apiv4_host_field',
|
|
+ value: '',
|
|
+ editable: true,
|
|
+ emptyText: Proxmox.Utils.noneText,
|
|
+ bind: {
|
|
+ hidden: '{!isFreeNAS}'
|
|
+ },
|
|
+ fieldLabel: gettext('API IPv4 Host'),
|
|
+ },
|
|
+ {
|
|
+ xtype: 'proxmoxtextfield',
|
|
+ name: 'freenas_password',
|
|
+ reference: 'freenas_password_field',
|
|
+ inputType: me.isCreate ? '' : 'password',
|
|
+ value: '',
|
|
+ editable: true,
|
|
+ deleteEmpty: true,
|
|
+ emptyText: Proxmox.Utils.noneText,
|
|
+ bind: {
|
|
+ hidden: '{!isFreeNAS}'
|
|
+ },
|
|
+ fieldLabel: gettext('API Password'),
|
|
+ change: function(f, value) {
|
|
+ if (f.rendered) {
|
|
+ f.up().down('field[name=freenas_confirmpw]').validate();
|
|
+ }
|
|
+ }
|
|
+ },
|
|
+ {
|
|
+ xtype: 'proxmoxtextfield',
|
|
+ name: 'freenas_confirmpw',
|
|
+ reference: 'freenas_confirmpw_field',
|
|
+ inputType: me.isCreate ? '' : 'password',
|
|
+ value: '',
|
|
+ editable: true,
|
|
+ submitValue: false,
|
|
+ deleteEmpty: true,
|
|
+ emptyText: Proxmox.Utils.noneText,
|
|
+ bind: {
|
|
+ hidden: '{!isFreeNAS}'
|
|
+ },
|
|
+ fieldLabel: gettext('Confirm Password'),
|
|
+ validator: function(value) {
|
|
+ var pw = this.up().down('field[name=freenas_password]').getValue();
|
|
+ if (pw !== value) {
|
|
+ return "Passwords do not match!";
|
|
+ }
|
|
+ return true;
|
|
+ }
|
|
}
|
|
];
|
|
|