etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 8194: Physical Resources page, Zone page: Add Primary Storage dialog, add a new protocol "PreSetup" if cluster type is XenServer.

This commit is contained in:
Jessica Wang 2011-02-03 11:31:17 -08:00
parent 5563a571c7
commit b75d23bb36
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/scripts/cloud.core.resource.js
View File

@ -1714,6 +1714,7 @@ function initAddPrimaryStorageShortcut($midmenuAddLink2, currentPageInRightPanel
} else if(objCluster.hypervisortype == "XenServer") {
$protocolSelector.empty();
$protocolSelector.append('<option value="nfs">NFS</option>');
$protocolSelector.append('<option value="PreSetup">PreSetup</option>');
$protocolSelector.append('<option value="iscsi">ISCSI</option>');
} else if(objCluster.hypervisortype == "VMware") {
$protocolSelector.empty();
@ -1742,7 +1743,7 @@ function initAddPrimaryStorageShortcut($midmenuAddLink2, currentPageInRightPanel
isValid &= validateDropDownBox("Pod", $thisDialog.find("#pod_dropdown"), $thisDialog.find("#pod_dropdown_errormsg"));
isValid &= validateDropDownBox("Cluster", $thisDialog.find("#cluster_select"), $thisDialog.find("#cluster_select_errormsg"), false); //required, reset error text
isValid &= validateString("Name", $thisDialog.find("#add_pool_name"), $thisDialog.find("#add_pool_name_errormsg"));
if (protocol == "nfs" || protocol == "sharedMountPoint") {
if (protocol == "nfs" || protocol == "PreSetup" || protocol == "sharedMountPoint") {
isValid &= validateString("Server", $thisDialog.find("#add_pool_nfs_server"), $thisDialog.find("#add_pool_nfs_server_errormsg"));
isValid &= validateString("Path", $thisDialog.find("#add_pool_path"), $thisDialog.find("#add_pool_path_errormsg"));
} else if(protocol == "iscsi") {
@ -1781,7 +1782,7 @@ function initAddPrimaryStorageShortcut($midmenuAddLink2, currentPageInRightPanel
var server = trim($thisDialog.find("#add_pool_nfs_server").val());
var url = null;
if (protocol == "nfs") {
if (protocol == "nfs" || protocol == "PreSetup") {
var path = trim($thisDialog.find("#add_pool_path").val());
if(path.substring(0,1)!="/")
path = "/" + path;

5
ui/scripts/cloud.core.zone.js
View File

@ -877,6 +877,7 @@ function bindAddPrimaryStorageButtonOnZonePage($button, zoneId, zoneName) {
} else if(objCluster.hypervisortype == "XenServer") {
$protocolSelector.empty();
$protocolSelector.append('<option value="nfs">NFS</option>');
$protocolSelector.append('<option value="PreSetup">PreSetup</option>');
$protocolSelector.append('<option value="iscsi">ISCSI</option>');
} else if(objCluster.hypervisortype == "VMware") {
$protocolSelector.empty();
@ -904,7 +905,7 @@ function bindAddPrimaryStorageButtonOnZonePage($button, zoneId, zoneName) {
isValid &= validateDropDownBox("Pod", $thisDialog.find("#pod_dropdown"), $thisDialog.find("#pod_dropdown_errormsg"));
isValid &= validateDropDownBox("Cluster", $thisDialog.find("#cluster_select"), $thisDialog.find("#cluster_select_errormsg"), false); //required, reset error text
isValid &= validateString("Name", $thisDialog.find("#add_pool_name"), $thisDialog.find("#add_pool_name_errormsg"));
if (protocol == "nfs" || protocol == "sharedMountPoint") {
if (protocol == "nfs" || protocol == "PreSetup" || protocol == "sharedMountPoint") {
isValid &= validateString("Server", $thisDialog.find("#add_pool_nfs_server"), $thisDialog.find("#add_pool_nfs_server_errormsg"));
isValid &= validateString("Path", $thisDialog.find("#add_pool_path"), $thisDialog.find("#add_pool_path_errormsg"));
} else if(protocol == "iscsi") {
@ -942,7 +943,7 @@ function bindAddPrimaryStorageButtonOnZonePage($button, zoneId, zoneName) {
var server = trim($thisDialog.find("#add_pool_nfs_server").val());
var url = null;
if (protocol == "nfs") {
if (protocol == "nfs" || protocol == "PreSetup") {
var path = trim($thisDialog.find("#add_pool_path").val());
if(path.substring(0,1)!="/")
path = "/" + path;