apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 12893: cloudstack 3.0 new UI - Add Primary Storage - when KVM cluster is selected, CLVM will show in protocol dropdown.

Browse Source
This commit is contained in:
Jessica Wang 2012-01-11 11:05:50 -08:00
parent 12b7fa60f0
commit 8c89b69ff3
1 changed files with 68 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
ui/scripts/system.js
View File

@ -5611,6 +5611,7 @@
var items = []; var items = [];
items.push({id: "nfs", description: "nfs"}); items.push({id: "nfs", description: "nfs"});
items.push({id: "SharedMountPoint", description: "SharedMountPoint"}); items.push({id: "SharedMountPoint", description: "SharedMountPoint"});
items.push({id: "clvm", description: "CLVM"});
args.response.success({data: items}); args.response.success({data: items});
} }
else if(selectedClusterObj.hypervisortype == "XenServer") { else if(selectedClusterObj.hypervisortype == "XenServer") {
@ -5658,6 +5659,9 @@
$form.find('.form-item[rel=iqn]').hide(); $form.find('.form-item[rel=iqn]').hide();
$form.find('.form-item[rel=lun]').hide(); $form.find('.form-item[rel=lun]').hide();
//$('li[input_group="clvm"]', $dialogAddPool).hide();
$form.find('.form-item[rel=volumegroup]').hide();
//$('li[input_group="vmfs"]', $dialogAddPool).hide(); //$('li[input_group="vmfs"]', $dialogAddPool).hide();
$form.find('.form-item[rel=vCenterDataCenter]').hide(); $form.find('.form-item[rel=vCenterDataCenter]').hide();
$form.find('.form-item[rel=vCenterDataStore]').hide(); $form.find('.form-item[rel=vCenterDataStore]').hide();
@ -5677,6 +5681,9 @@
$form.find('.form-item[rel=iqn]').hide(); $form.find('.form-item[rel=iqn]').hide();
$form.find('.form-item[rel=lun]').hide(); $form.find('.form-item[rel=lun]').hide();
//$('li[input_group="clvm"]', $dialogAddPool).hide();
$form.find('.form-item[rel=volumegroup]').hide();
//$('li[input_group="vmfs"]', $dialogAddPool).hide(); //$('li[input_group="vmfs"]', $dialogAddPool).hide();
$form.find('.form-item[rel=vCenterDataCenter]').hide(); $form.find('.form-item[rel=vCenterDataCenter]').hide();
$form.find('.form-item[rel=vCenterDataStore]').hide(); $form.find('.form-item[rel=vCenterDataStore]').hide();
@ -5696,6 +5703,9 @@
$form.find('.form-item[rel=iqn]').hide(); $form.find('.form-item[rel=iqn]').hide();
$form.find('.form-item[rel=lun]').hide(); $form.find('.form-item[rel=lun]').hide();
//$('li[input_group="clvm"]', $dialogAddPool).hide();
$form.find('.form-item[rel=volumegroup]').hide();
//$('li[input_group="vmfs"]', $dialogAddPool).hide(); //$('li[input_group="vmfs"]', $dialogAddPool).hide();
$form.find('.form-item[rel=vCenterDataCenter]').hide(); $form.find('.form-item[rel=vCenterDataCenter]').hide();
$form.find('.form-item[rel=vCenterDataStore]').hide(); $form.find('.form-item[rel=vCenterDataStore]').hide();
@ -5713,10 +5723,33 @@
$form.find('.form-item[rel=iqn]').css('display', 'inline-block'); $form.find('.form-item[rel=iqn]').css('display', 'inline-block');
$form.find('.form-item[rel=lun]').css('display', 'inline-block'); $form.find('.form-item[rel=lun]').css('display', 'inline-block');
//$('li[input_group="clvm"]', $dialogAddPool).hide();
$form.find('.form-item[rel=volumegroup]').hide();
//$('li[input_group="vmfs"]', $dialogAddPool).hide(); //$('li[input_group="vmfs"]', $dialogAddPool).hide();
$form.find('.form-item[rel=vCenterDataCenter]').hide(); $form.find('.form-item[rel=vCenterDataCenter]').hide();
$form.find('.form-item[rel=vCenterDataStore]').hide(); $form.find('.form-item[rel=vCenterDataStore]').hide();
} }
else if($(this).val() == "clvm") {
//$("#add_pool_server_container", $dialogAddPool).hide();
$form.find('.form-item[rel=server]').hide();
//$dialogAddPool.find("#add_pool_nfs_server").val("localhost");
$form.find('.form-item[rel=server]').find(".value").find("input").val("localhost");
//$('li[input_group="nfs"]', $dialogAddPool).hide();
$form.find('.form-item[rel=path]').hide();
//$('li[input_group="iscsi"]', $dialogAddPool).hide();
$form.find('.form-item[rel=iqn]').hide();
$form.find('.form-item[rel=lun]').hide();
//$('li[input_group="clvm"]', $dialogAddPool).show();
$form.find('.form-item[rel=volumegroup]').css('display', 'inline-block');
//$('li[input_group="vmfs"]', $dialogAddPool).hide();
$form.find('.form-item[rel=vCenterDataCenter]').hide();
$form.find('.form-item[rel=vCenterDataStore]').hide();
}
else if(protocol == "vmfs") { else if(protocol == "vmfs") {
//$dialogAddPool.find("#add_pool_server_container").show(); //$dialogAddPool.find("#add_pool_server_container").show();
$form.find('.form-item[rel=server]').css('display', 'inline-block'); $form.find('.form-item[rel=server]').css('display', 'inline-block');
@ -5730,6 +5763,9 @@
$form.find('.form-item[rel=iqn]').hide(); $form.find('.form-item[rel=iqn]').hide();
$form.find('.form-item[rel=lun]').hide(); $form.find('.form-item[rel=lun]').hide();
//$('li[input_group="clvm"]', $dialogAddPool).hide();
$form.find('.form-item[rel=volumegroup]').hide();
//$('li[input_group="vmfs"]', $dialogAddPool).show(); //$('li[input_group="vmfs"]', $dialogAddPool).show();
$form.find('.form-item[rel=vCenterDataCenter]').css('display', 'inline-block'); $form.find('.form-item[rel=vCenterDataCenter]').css('display', 'inline-block');
$form.find('.form-item[rel=vCenterDataStore]').css('display', 'inline-block'); $form.find('.form-item[rel=vCenterDataStore]').css('display', 'inline-block');
@ -5748,6 +5784,9 @@
$form.find('.form-item[rel=iqn]').hide(); $form.find('.form-item[rel=iqn]').hide();
$form.find('.form-item[rel=lun]').hide(); $form.find('.form-item[rel=lun]').hide();
//$('li[input_group="clvm"]', $dialogAddPool).hide();
$form.find('.form-item[rel=volumegroup]').hide();
//$('li[input_group="vmfs"]', $dialogAddPool).hide(); //$('li[input_group="vmfs"]', $dialogAddPool).hide();
$form.find('.form-item[rel=vCenterDataCenter]').hide(); $form.find('.form-item[rel=vCenterDataCenter]').hide();
$form.find('.form-item[rel=vCenterDataStore]').hide(); $form.find('.form-item[rel=vCenterDataStore]').hide();
@ -5762,6 +5801,9 @@
$form.find('.form-item[rel=iqn]').hide(); $form.find('.form-item[rel=iqn]').hide();
$form.find('.form-item[rel=lun]').hide(); $form.find('.form-item[rel=lun]').hide();
//$('li[input_group="clvm"]', $dialogAddPool).hide();
$form.find('.form-item[rel=volumegroup]').hide();
//$('li[input_group="vmfs"]', $dialogAddPool).hide(); //$('li[input_group="vmfs"]', $dialogAddPool).hide();
$form.find('.form-item[rel=vCenterDataCenter]').hide(); $form.find('.form-item[rel=vCenterDataCenter]').hide();
$form.find('.form-item[rel=vCenterDataStore]').hide(); $form.find('.form-item[rel=vCenterDataStore]').hide();
@ -5798,6 +5840,13 @@
isHidden: true isHidden: true
}, },
//clvm
volumegroup: {
label: 'Volume Group',
validation: { required: true },
isHidden: true
},
//vmfs //vmfs
vCenterDataCenter: { vCenterDataCenter: {
label: 'vCenter Datacenter', label: 'vCenter Datacenter',
@ -5859,7 +5908,15 @@
if(path.substring(0,1) != "/") if(path.substring(0,1) != "/")
path = "/" + path; path = "/" + path;
url = SharedMountPointURL(server, path); url = SharedMountPointURL(server, path);
} }
else if (args.data.protocol == "clvm") {
//var vg = trim($thisDialog.find("#add_pool_clvm_vg").val());
var vg = args.data.volumegroup;
if(vg.substring(0,1) != "/")
vg = "/" + vg;
url = clvmURL(vg);
}
else if (args.data.protocol == "vmfs") { else if (args.data.protocol == "vmfs") {
//var path = trim($thisDialog.find("#add_pool_vmfs_dc").val()); //var path = trim($thisDialog.find("#add_pool_vmfs_dc").val());
var path = args.data.vCenterDataCenter; var path = args.data.vCenterDataCenter;
@ -6486,6 +6543,15 @@
return url; return url;
} }
function clvmURL(vgname) {
var url;
if(vgname.indexOf("://")==-1)
url = "clvm://localhost/" + vgname;
else
url = vgname;
return url;
}
function vmfsURL(server, path) { function vmfsURL(server, path) {
var url; var url;
if(server.indexOf("://")==-1) if(server.indexOf("://")==-1)