From 20500b6c9981ea96bf2a7a4cbab136d56480a722 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Wed, 19 Nov 2014 10:52:07 +0100 Subject: [PATCH] bug #3361: Add missing datastore attrs in the creation wizard (cherry picked from commit 570f8524cbf4a83d53629b2ab49374c306929b7c) --- .../public/js/plugins/datastores-tab.js | 140 +++++++++--------- 1 file changed, 72 insertions(+), 68 deletions(-) diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index 3e2c97ae57..96c963921b 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -127,24 +127,12 @@ var create_datastore_tmpl = '\ \ \ - \ -
\
\ \ \
\ -
\ -
\ -
\ - \ - \ -
\ -
\ -
\
\
\
\ - \ -
\ -
\ - \ -
\ -
\ - \ - \ -
\ -
\ - \ - \ + \ + \
\
\ \ \
\ -
\ -
\ +
\ + \ +
\ +
\ + \ +
\ +
\ + \ + \ +
\ +
\ + \ + \ +
\ +
\ + \ + \ +
\
\
\
\ \ \
\ @@ -221,15 +221,6 @@ var create_datastore_tmpl = '\ \
\ -
\ - \ - \ -
\ -
\ - \ -
\ \
\
\ @@ -817,14 +808,12 @@ function hide_all(context) { // Hide all the options that depends on datastore type // and reset the selects - $('label[for="ds_use_ssh"],input#ds_use_ssh',context).hide(); - $('label[for="tm_use_ssh"],input#tm_use_ssh',context).hide(); $('input#image_ds_type').attr('checked', 'true'); $('input[name=ds_type]').removeAttr('disabled', 'disabled'); - $('label[for="bridge_list"],input#bridge_list',context).parent().parent().hide(); - $('label[for="base_iqn"],input#base_iqn',context).hide(); + $('label[for="bridge_list"],input#bridge_list',context).parent().hide(); + $('label[for="ds_tmp_dir"],input#ds_tmp_dir',context).parent().hide(); $('label[for="vg_name"],input#vg_name',context).hide(); $('label[for="gluster_host"],input#gluster_host',context).parent().hide(); $('label[for="gluster_volume"],input#gluster_volume',context).parent().hide(); @@ -924,13 +913,16 @@ function setupCreateDatastoreDialog(){ var tm_mad = $('#tm_mad',context).val(); tm_mad = tm_mad == "custom" ? $('input[name="ds_tab_custom_tm_mad"]').val() : tm_mad; var type = $('#disk_type',context).val(); + var safe_dirs = $('#safe_dirs',context).val(); var base_path = $('#base_path',context).val(); var restricted_dirs = $('#restricted_dirs',context).val(); + var limit_transfer_bw = $('#limit_transfer_bw',context).val(); + var datastore_capacity_check = $('#datastore_capacity_check',context).is(':checked'); + var no_decompress = $('#no_decompress',context).is(':checked'); + var bridge_list = $('#bridge_list',context).val(); - var ds_use_ssh = $('#ds_use_ssh',context).is(':checked'); - var tm_use_ssh = $('#tm_use_ssh',context).is(':checked'); - var base_iqn = $('#base_iqn',context).val(); + var ds_tmp_dir = $('#ds_tmp_dir',context).val(); var vg_name = $('#vg_name',context).val(); var limit_mb = $('#limit_mb',context).val(); var gluster_host = $('#gluster_host',context).val(); @@ -941,8 +933,6 @@ function setupCreateDatastoreDialog(){ var ceph_user = $('#ceph_user',context).val(); var rbd_format = $('#rbd_format',context).val(); var staging_dir = $('#staging_dir',context).val(); - var limit_transfer_bw = $('#limit_transfer_bw',context).val(); - var no_decompress = $('#no_decompress',context).is(':checked'); if (!name){ @@ -974,17 +964,20 @@ function setupCreateDatastoreDialog(){ if (restricted_dirs) ds_obj.datastore.restricted_dirs = restricted_dirs; + if (limit_transfer_bw) + ds_obj.datastore.limit_transfer_bw = limit_transfer_bw; + + if (no_decompress) + ds_obj.datastore.no_decompress = "YES"; + + if (datastore_capacity_check) + ds_obj.datastore.datastore_capacity_check = "YES"; + if (bridge_list) ds_obj.datastore.bridge_list = bridge_list; - if (ds_use_ssh) - ds_obj.datastore.ds_use_ssh = "YES"; - - if (tm_use_ssh) - ds_obj.datastore.tm_use_ssh = "YES"; - - if (base_iqn) - ds_obj.datastore.base_iqn = base_iqn; + if (ds_tmp_dir) + ds_obj.datastore.ds_tmp_dir = ds_tmp_dir; if (vg_name) ds_obj.datastore.vg_name = vg_name; @@ -1016,16 +1009,6 @@ function setupCreateDatastoreDialog(){ if (staging_dir) ds_obj.datastore.staging_dir = staging_dir; - if (limit_transfer_bw) - ds_obj.datastore.limit_transfer_bw = limit_transfer_bw; - - if (no_decompress) - ds_obj.datastore.no_decompress = "YES"; - - // Sanitize dialog - $('#ds_use_ssh').prop('checked', false); - $('#tm_use_ssh').prop('checked', false); - Sunstone.runAction("Datastore.create",ds_obj); return false; }); @@ -1087,6 +1070,9 @@ function select_filesystem(){ }); $('select#disk_type').val('file'); $('select#disk_type').attr('disabled', 'disabled'); + $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn(); + $('label[for="no_decompress"],input#no_decompress').parent().fadeIn(); + $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn(); $('input#safe_dirs').removeAttr('disabled'); $('select#disk_type').removeAttr('disabled'); $('input#base_path').removeAttr('disabled'); @@ -1095,13 +1081,15 @@ function select_filesystem(){ } function select_vmware_vmfs(){ - $('label[for="bridge_list"],input#bridge_list').parent().parent().fadeIn(); - $('label[for="ds_use_ssh"],input#ds_use_ssh').fadeIn(); - $('label[for="tm_use_ssh"],input#tm_use_ssh').fadeIn(); + $('label[for="bridge_list"],input#bridge_list').parent().fadeIn(); + $('label[for="ds_tmp_dir"],input#ds_tmp_dir').parent().fadeIn(); $('select#ds_mad').val('vmfs'); $('select#ds_mad').attr('disabled', 'disabled'); $('select#tm_mad').val('vmfs'); $('select#tm_mad').attr('disabled', 'disabled'); + $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn(); + $('label[for="no_decompress"],input#no_decompress').parent().fadeIn(); + $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn(); $('select#disk_type').val('file'); $('select#disk_type').attr('disabled', 'disabled'); $('input#safe_dirs').removeAttr('disabled'); @@ -1117,7 +1105,7 @@ function select_ceph(){ $('select#ds_mad').attr('disabled', 'disabled'); $('select#tm_mad').val('ceph'); $('select#tm_mad').attr('disabled', 'disabled'); - $('label[for="bridge_list"],input#bridge_list').parent().parent().fadeIn(); + $('label[for="bridge_list"],input#bridge_list').parent().fadeIn(); $('label[for="pool_name"],input#pool_name').parent().fadeIn(); $('label[for="ceph_host"],input#ceph_host').parent().fadeIn(); $('label[for="ceph_secret"],input#ceph_secret').parent().fadeIn(); @@ -1126,6 +1114,7 @@ function select_ceph(){ $('label[for="staging_dir"],input#staging_dir').parent().fadeIn(); $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn(); $('label[for="no_decompress"],input#no_decompress').parent().fadeIn(); + $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn(); $('select#disk_type').val('RBD'); $('select#disk_type').attr('disabled', 'disabled'); $('input#safe_dirs').removeAttr('disabled'); @@ -1141,8 +1130,11 @@ function select_block_lvm(){ $('select#tm_mad').attr('disabled', 'disabled'); $('input#image_ds_type').attr('checked', 'true'); $('input[name=ds_type]').attr('disabled', 'disabled'); - $('label[for="bridge_list"],input#bridge_list').parent().parent().fadeIn(); + $('label[for="bridge_list"],input#bridge_list').parent().fadeIn(); $('label[for="vg_name"],input#vg_name').fadeIn(); + $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn(); + $('label[for="no_decompress"],input#no_decompress').parent().fadeIn(); + $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn(); $('select#disk_type').val('block'); $('select#disk_type').attr('disabled', 'disabled'); $('input#safe_dirs').removeAttr('disabled'); @@ -1158,6 +1150,9 @@ function select_fs_lvm(){ $('select#tm_mad').attr('disabled', 'disabled'); $('input#image_ds_type').attr('checked', 'true'); $('input[name=ds_type]').attr('disabled', 'disabled'); + $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn(); + $('label[for="no_decompress"],input#no_decompress').parent().fadeIn(); + $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn(); $('select#disk_type').val('block'); $('select#disk_type').attr('disabled', 'disabled'); $('input#safe_dirs').removeAttr('disabled'); @@ -1185,6 +1180,9 @@ function select_gluster(){ $('select#disk_type').attr('disabled', 'disabled'); $('label[for="gluster_host"],input#gluster_host').parent().fadeIn(); $('label[for="gluster_volume"],input#gluster_volume').parent().fadeIn(); + $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn(); + $('label[for="no_decompress"],input#no_decompress').parent().fadeIn(); + $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn(); $('input#safe_dirs').removeAttr('disabled'); $('input#base_path').removeAttr('disabled'); $('input#limit_mb').removeAttr('disabled'); @@ -1200,6 +1198,9 @@ function select_devices(){ $('input[name=ds_type]').attr('disabled', 'disabled'); $('select#disk_type').val('block'); $('select#disk_type').attr('disabled', 'disabled'); + $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().hide(); + $('label[for="no_decompress"],input#no_decompress').parent().hide(); + $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().hide(); $('input#safe_dirs').attr('disabled', 'disabled'); $('input#base_path').attr('disabled', 'disabled'); $('input#limit_mb').attr('disabled', 'disabled'); @@ -1215,6 +1216,9 @@ function select_custom(){ $('input#base_path').removeAttr('disabled'); $('input#limit_mb').removeAttr('disabled'); $('input#restricted_dirs').removeAttr('disabled'); + $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn(); + $('label[for="no_decompress"],input#no_decompress').parent().fadeIn(); + $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn(); } function popUpCreateDatastoreDialog(){