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

change VmWare to trademarked name VMware

Browse Source
This commit is contained in:
Kelven Yang 2011-01-31 14:08:18 -08:00
parent 91ccd7839a
commit 2b2885cf5e
7 changed files with 109 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
console-proxy/.classpath
View File

@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/console"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/proxy-deps"/>
<classpathentry combineaccessrules="false" kind="src" path="/console-common"/>
<classpathentry kind="output" path="bin"/>
</classpath>

2
console-viewer/.classpath
View File

@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/console"/>
<classpathentry combineaccessrules="false" kind="src" path="/console-common"/>
<classpathentry kind="output" path="bin"/>
</classpath>

160
deps/cloud.userlibraries vendored
View File

@ -1,103 +1,103 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<eclipse-userlibraries version="2">
<library name="agent-deps" systemlibrary="false">
<archive path="/home/dev/deps/cloud-libvirt-0.4.5.jar"/>
<archive path="/home/dev/deps/cloud-log4j.jar"/>
<archive path="/home/dev/deps/cloud-junit-4.8.1.jar"/>
<archive path="/home/dev/deps/cloud-commons-httpclient-3.1.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-libvirt-0.4.5.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-junit-4.8.1.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-commons-httpclient-3.1.jar"/>
</library>
<library name="api-deps" systemlibrary="false">
<archive path="/home/dev/deps/cloud-log4j.jar"/>
<archive path="/home/dev/deps/cloud-gson.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-gson.jar"/>
</library>
<library name="core-deps" systemlibrary="false">
<archive path="/home/dev/deps/cloud-commons-httpclient-3.1.jar"/>
<archive path="/home/dev/deps/cloud-gson.jar"/>
<archive path="/home/dev/deps/cloud-trilead-ssh2-build213.jar"/>
<archive path="/home/dev/deps/cloud-xenserver-5.6.100-1.jar"/>
<archive path="/home/dev/deps/cloud-xmlrpc-client-3.1.3.jar"/>
<archive path="/home/dev/deps/cloud-xmlrpc-common-3.1.3.jar"/>
<archive path="/home/dev/deps/cloud-log4j.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-commons-httpclient-3.1.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-gson.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-trilead-ssh2-build213.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-xenserver-5.6.100-1.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-xmlrpc-client-3.1.3.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-xmlrpc-common-3.1.3.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
</library>
<library name="corep-deps" systemlibrary="false">
<archive path="/home/dev/deps/vmware-apputils.jar"/>
<archive path="/home/dev/deps/vmware-credstore.jar"/>
<archive path="/home/dev/deps/vmware-lib-activation.jar"/>
<archive path="/home/dev/deps/vmware-lib-jaxen-core.jar"/>
<archive path="/home/dev/deps/vmware-lib-jaxen-jdom.jar"/>
<archive path="/home/dev/deps/vmware-lib-jaxrpc.jar"/>
<archive path="/home/dev/deps/vmware-lib-jdom.jar"/>
<archive path="/home/dev/deps/vmware-lib-mailapi.jar"/>
<archive path="/home/dev/deps/vmware-lib-saxpath.jar"/>
<archive path="/home/dev/deps/vmware-lib-smtp.jar"/>
<archive path="/home/dev/deps/vmware-lib-wbem.jar"/>
<archive path="/home/dev/deps/vmware-lib-xalan.jar"/>
<archive path="/home/dev/deps/vmware-lib-xerces.jar"/>
<archive path="/home/dev/deps/vmware-lib-xml-apis.jar"/>
<archive path="/home/dev/deps/vmware-vim.jar"/>
<archive path="/home/dev/deps/vmware-vim25.jar"/>
<archive path="/home/dev/deps/cloud-log4j.jar"/>
<archive path="/home/dev/deps/cloud-axis.jar"/>
<archive path="/home/dev/deps/cloud-gson.jar"/>
<archive path="/home/dev/deps/cloud-trilead-ssh2-build213.jar"/>
<archive path="/home/dev/deps/cloud-iControl.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-apputils.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-credstore.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-activation.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-jaxen-core.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-jaxen-jdom.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-jaxrpc.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-jdom.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-mailapi.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-saxpath.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-smtp.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-wbem.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-xalan.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-xerces.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-xml-apis.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-vim.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-vim25.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-axis.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-gson.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-trilead-ssh2-build213.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-iControl.jar"/>
</library>
<library name="proxy-deps" systemlibrary="false">
<archive path="/home/dev/deps/cloud-gson.jar"/>
<archive path="/home/dev/deps/cloud-log4j.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-gson.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
</library>
<library name="server-deps" systemlibrary="false">
<archive path="/home/dev/deps/cloud-log4j.jar"/>
<archive path="/home/dev/deps/cloud-gson.jar"/>
<archive path="/home/dev/deps/cloud-xenserver-5.6.100-1.jar"/>
<archive path="/home/dev/deps/cloud-email.jar"/>
<archive path="/home/dev/thirdparty/servlet-api.jar"/>
<archive path="/home/dev/deps/cloud-xstream-1.3.1.jar"/>
<archive path="/home/dev/deps/cloud-httpcore-4.0.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-gson.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-xenserver-5.6.100-1.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-email.jar"/>
<archive path="/home/kelven/cloud-dev/thirdparty/servlet-api.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-xstream-1.3.1.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-httpcore-4.0.jar"/>
</library>
<library name="serverp-deps" systemlibrary="false">
<archive path="/home/dev/deps/cloud-log4j.jar"/>
<archive path="/home/dev/deps/vmware-apputils.jar"/>
<archive path="/home/dev/deps/vmware-credstore.jar"/>
<archive path="/home/dev/deps/vmware-lib-activation.jar"/>
<archive path="/home/dev/deps/vmware-lib-jaxen-core.jar"/>
<archive path="/home/dev/deps/vmware-lib-jaxen-jdom.jar"/>
<archive path="/home/dev/deps/vmware-lib-jaxrpc.jar"/>
<archive path="/home/dev/deps/vmware-lib-jdom.jar"/>
<archive path="/home/dev/deps/vmware-lib-mailapi.jar"/>
<archive path="/home/dev/deps/vmware-lib-saxpath.jar"/>
<archive path="/home/dev/deps/vmware-lib-smtp.jar"/>
<archive path="/home/dev/deps/vmware-lib-wbem.jar"/>
<archive path="/home/dev/deps/vmware-lib-xalan.jar"/>
<archive path="/home/dev/deps/vmware-lib-xerces.jar"/>
<archive path="/home/dev/deps/vmware-lib-xml-apis.jar"/>
<archive path="/home/dev/deps/vmware-vim.jar"/>
<archive path="/home/dev/deps/vmware-vim25.jar"/>
<archive path="/home/dev/deps/cloud-gson.jar"/>
<archive path="/home/dev/deps/cloud-axis.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-apputils.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-credstore.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-activation.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-jaxen-core.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-jaxen-jdom.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-jaxrpc.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-jdom.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-mailapi.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-saxpath.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-smtp.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-wbem.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-xalan.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-xerces.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-lib-xml-apis.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-vim.jar"/>
<archive path="/home/kelven/cloud-dev/deps/vmware-vim25.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-gson.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-axis.jar"/>
</library>
<library name="test-deps" systemlibrary="false">
<archive path="/home/dev/thirdparty/selenium-java-client-driver.jar"/>
<archive path="/home/dev/thirdparty/selenium-server.jar"/>
<archive path="/home/dev/deps/cloud-commons-httpclient-3.1.jar"/>
<archive path="/home/dev/deps/cloud-log4j.jar"/>
<archive path="/home/dev/deps/cloud-mysql-connector-java-5.1.7-bin.jar"/>
<archive path="/home/dev/deps/cloud-trilead-ssh2-build213.jar"/>
<archive path="/home/kelven/cloud-dev/thirdparty/selenium-java-client-driver.jar"/>
<archive path="/home/kelven/cloud-dev/thirdparty/selenium-server.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-commons-httpclient-3.1.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-mysql-connector-java-5.1.7-bin.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-trilead-ssh2-build213.jar"/>
</library>
<library name="usage-deps" systemlibrary="false">
<archive path="/home/dev/deps/cloud-log4j.jar"/>
<archive path="/home/dev/deps/cloud-email.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-email.jar"/>
</library>
<library name="utils-deps" systemlibrary="false">
<archive path="/home/dev/deps/cloud-backport-util-concurrent-3.0.jar"/>
<archive path="/home/dev/deps/cloud-cglib.jar"/>
<archive path="/home/dev/deps/cloud-log4j.jar"/>
<archive path="/home/dev/deps/cloud-bcprov-jdk16-1.45.jar"/>
<archive path="/home/dev/deps/cloud-commons-dbcp-1.2.2.jar"/>
<archive path="/home/dev/deps/cloud-commons-pool-1.4.jar"/>
<archive path="/home/dev/deps/cloud-ehcache.jar"/>
<archive path="/home/dev/deps/cloud-jsch-0.1.42.jar"/>
<archive path="/home/dev/deps/cloud-commons-codec-1.4.jar"/>
<archive path="/home/dev/deps/cloud-junit-4.8.1.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-backport-util-concurrent-3.0.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-cglib.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-bcprov-jdk16-1.45.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-commons-dbcp-1.2.2.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-commons-pool-1.4.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-ehcache.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-jsch-0.1.42.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-commons-codec-1.4.jar"/>
<archive path="/home/kelven/cloud-dev/deps/cloud-junit-4.8.1.jar"/>
</library>
</eclipse-userlibraries>

18
ui/scripts/cloud.core.pod.js
View File

@ -316,7 +316,7 @@ function bindAddClusterButton($leftmenuItem1) {
}
dialogAddCluster.find("#cluster_hypervisor").change(function() {
if($(this).val() == "VmWare") {
if($(this).val() == "VMware") {
$('li[input_group="vmware"]', dialogAddCluster).show();
dialogAddCluster.find("#type_dropdown").change();
} else {
@ -341,12 +341,12 @@ function bindAddClusterButton($leftmenuItem1) {
var hypervisor = $thisDialog.find("#cluster_hypervisor").val();
var clusterType="CloudManaged";
if(hypervisor == "VmWare")
if(hypervisor == "VMware")
clusterType = $thisDialog.find("#type_dropdown").val();
// validate values
var isValid = true;
if(hypervisor == "VmWare" && clusterType != "CloudManaged") {
if(hypervisor == "VMware" && clusterType != "CloudManaged") {
isValid &= validateString("vCenter Server", $thisDialog.find("#cluster_hostname"), $thisDialog.find("#cluster_hostname_errormsg"));
isValid &= validateString("vCenter user", $thisDialog.find("#cluster_username"), $thisDialog.find("#cluster_username_errormsg"));
isValid &= validateString("Password", $thisDialog.find("#cluster_password"), $thisDialog.find("#cluster_password_errormsg"));
@ -366,7 +366,7 @@ function bindAddClusterButton($leftmenuItem1) {
array1.push("&podId="+podId);
var clusterName = trim($thisDialog.find("#cluster_name").val());
if(hypervisor == "VmWare" && clusterType != "CloudManaged") {
if(hypervisor == "VMware" && clusterType != "CloudManaged") {
var username = trim($thisDialog.find("#cluster_username").val());
array1.push("&username="+todb(username));
@ -443,7 +443,7 @@ function bindAddHostButton($leftmenuItem1) {
if(clusterId == null)
return;
var clusterObj = clustersUnderOnePod[clusterId];
if(clusterObj.hypervisortype == "VmWare") {
if(clusterObj.hypervisortype == "VMware") {
$('li[input_group="vmware"]', dialogAddHost).show();
$('li[input_group="general"]', dialogAddHost).hide();
} else {
@ -483,7 +483,7 @@ function bindAddHostButton($leftmenuItem1) {
/*
dialogAddHost.find("#host_hypervisor").change(function() {
if($(this).val() == "VmWare") {
if($(this).val() == "VMware") {
$('li[input_group="vmware"]', dialogAddHost).show();
$('li[input_group="general"]', dialogAddHost).hide();
} else {
@ -514,7 +514,7 @@ function bindAddHostButton($leftmenuItem1) {
if(clusterId != null) {
clusterObj = clustersUnderOnePod[clusterId];
hypervisor = clusterObj.hypervisortype;
if(hypervisor == "VmWare") {
if(hypervisor == "VMware") {
isValid &= validateString("vCenter Address", $thisDialog.find("#host_vcenter_address"), $thisDialog.find("#host_vcenter_address_errormsg"));
isValid &= validateString("vCenter User", $thisDialog.find("#host_vcenter_username"), $thisDialog.find("#host_vcenter_username_errormsg"));
isValid &= validateString("vCenter Password", $thisDialog.find("#host_vcenter_password"), $thisDialog.find("#host_vcenter_password_errormsg"));
@ -539,7 +539,7 @@ function bindAddHostButton($leftmenuItem1) {
var clustertype = clusterObj.clustertype;
array1.push("&clustertype=" + clustertype);
if(hypervisor == "VmWare") {
if(hypervisor == "VMware") {
var username = trim($thisDialog.find("#host_vcenter_username").val());
array1.push("&username="+todb(username));
@ -679,7 +679,7 @@ function bindAddPrimaryStorageButton($leftmenuItem1) {
$protocolSelector.empty();
$protocolSelector.append('<option value="nfs">NFS</option>');
$protocolSelector.append('<option value="iscsi">ISCSI</option>');
} else if(objCluster.hypervisortype == "VmWare") {
} else if(objCluster.hypervisortype == "VMware") {
$protocolSelector.empty();
$protocolSelector.append('<option value="nfs">NFS</option>');
$protocolSelector.append('<option value="vmfs">VMFS datastore</option>');

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

@ -685,7 +685,7 @@ function initAddClusterShortcut() {
var $hypervisorDropdown = $dialogAddCluster.find("#cluster_hypervisor");
$hypervisorDropdown.change(function() {
if($(this).val() == "VmWare") {
if($(this).val() == "VMware") {
$('li[input_group="vmware"]', $dialogAddCluster).show();
$dialogAddCluster.find("#type_dropdown").change();
} else {
@ -717,13 +717,13 @@ function initAddClusterShortcut() {
// validate values
var hypervisor = $thisDialog.find("#cluster_hypervisor").val();
var clusterType="CloudManaged";
if(hypervisor == "VmWare")
if(hypervisor == "VMware")
clusterType = $thisDialog.find("#type_dropdown").val();
var isValid = true;
isValid &= validateDropDownBox("Zone", $thisDialog.find("#zone_dropdown"), $thisDialog.find("#zone_dropdown_errormsg"));
isValid &= validateDropDownBox("Pod", $thisDialog.find("#pod_dropdown"), $thisDialog.find("#pod_dropdown_errormsg"));
if(hypervisor == "VmWare" && clusterType != "CloudManaged") {
if(hypervisor == "VMware" && clusterType != "CloudManaged") {
isValid &= validateString("vCenter Server", $thisDialog.find("#cluster_hostname"), $thisDialog.find("#cluster_hostname_errormsg"));
isValid &= validateString("vCenter user", $thisDialog.find("#cluster_username"), $thisDialog.find("#cluster_username_errormsg"));
isValid &= validateString("Password", $thisDialog.find("#cluster_password"), $thisDialog.find("#cluster_password_errormsg"));
@ -751,7 +751,7 @@ function initAddClusterShortcut() {
array1.push("&podId="+podId);
var clusterName = trim($thisDialog.find("#cluster_name").val());
if(hypervisor == "VmWare" && clusterType != "CloudManaged") {
if(hypervisor == "VMware" && clusterType != "CloudManaged") {
var username = trim($thisDialog.find("#cluster_username").val());
array1.push("&username="+todb(username));
@ -827,7 +827,7 @@ function initAddHostShortcut() {
/*
$dialogAddHost.find("#host_hypervisor").change(function() {
if($(this).val() == "VmWare") {
if($(this).val() == "VMware") {
$('li[input_group="general"]', $dialogAddHost).hide();
$('li[input_group="vmware"]', $dialogAddHost).show();
} else {
@ -870,7 +870,7 @@ function initAddHostShortcut() {
if(clusterId == null)
return;
var clusterObj = clustersUnderOnePod[clusterId];
if(clusterObj.hypervisortype == "VmWare") {
if(clusterObj.hypervisortype == "VMware") {
$('li[input_group="vmware"]', $dialogAddHost).show();
$('li[input_group="general"]', $dialogAddHost).hide();
} else {
@ -901,7 +901,7 @@ function initAddHostShortcut() {
if(clusterId != null) {
clusterObj = clustersUnderOnePod[clusterId];
hypervisor = clusterObj.hypervisortype;
if(hypervisor == "VmWare") {
if(hypervisor == "VMware") {
isValid &= validateString("vCenter Address", $thisDialog.find("#host_vcenter_address"), $thisDialog.find("#host_vcenter_address_errormsg"));
isValid &= validateString("vCenter User", $thisDialog.find("#host_vcenter_username"), $thisDialog.find("#host_vcenter_username_errormsg"));
isValid &= validateString("vCenter Password", $thisDialog.find("#host_vcenter_password"), $thisDialog.find("#host_vcenter_password_errormsg"));
@ -944,7 +944,7 @@ function initAddHostShortcut() {
var clustertype = clusterObj.clustertype;
array1.push("&clustertype=" + clustertype);
if(hypervisor == "VmWare") {
if(hypervisor == "VMware") {
var username = trim($thisDialog.find("#host_vcenter_username").val());
array1.push("&username="+todb(username));
@ -1714,7 +1714,7 @@ function initAddPrimaryStorageShortcut($midmenuAddLink2, currentPageInRightPanel
$protocolSelector.empty();
$protocolSelector.append('<option value="nfs">NFS</option>');
$protocolSelector.append('<option value="iscsi">ISCSI</option>');
} else if(objCluster.hypervisortype == "VmWare") {
} else if(objCluster.hypervisortype == "VMware") {
$protocolSelector.empty();
$protocolSelector.append('<option value="nfs">NFS</option>');
$protocolSelector.append('<option value="vmfs">VMFS datastore</option>');

2
ui/scripts/cloud.core.template.js
View File

@ -75,7 +75,7 @@ function afterLoadTemplateJSP() {
if(selectedHypervisorType == "XenServer")
formatSelect.append("<option value='VHD'>VHD</option>");
else if(selectedHypervisorType == "VmWare")
else if(selectedHypervisorType == "VMware")
formatSelect.append("<option value='OVA'>OVA</option>");
else if(selectedHypervisorType == "KVM")
formatSelect.append("<option value='QCOW2'>QCOW2</option>");

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

@ -523,7 +523,7 @@ function bindAddClusterButtonOnZonePage($button, zoneId, zoneName) {
});
$dialogAddCluster.find("#cluster_hypervisor").change(function() {
if($(this).val() == "VmWare") {
if($(this).val() == "VMware") {
$('li[input_group="vmware"]', $dialogAddCluster).show();
$dialogAddCluster.find("#type_dropdown").change();
} else {
@ -549,12 +549,12 @@ function bindAddClusterButtonOnZonePage($button, zoneId, zoneName) {
// validate values
var hypervisor = $thisDialog.find("#cluster_hypervisor").val();
var clusterType="CloudManaged";
if(hypervisor == "VmWare")
if(hypervisor == "VMware")
clusterType = $thisDialog.find("#type_dropdown").val();
var isValid = true;
isValid &= validateDropDownBox("Pod", $thisDialog.find("#pod_dropdown"), $thisDialog.find("#pod_dropdown_errormsg"));
if(hypervisor == "VmWare" && clusterType != "CloudManaged") {
if(hypervisor == "VMware" && clusterType != "CloudManaged") {
isValid &= validateString("vCenter Server", $thisDialog.find("#cluster_hostname"), $thisDialog.find("#cluster_hostname_errormsg"));
isValid &= validateString("vCenter user", $thisDialog.find("#cluster_username"), $thisDialog.find("#cluster_username_errormsg"));
isValid &= validateString("Password", $thisDialog.find("#cluster_password"), $thisDialog.find("#cluster_password_errormsg"));
@ -580,7 +580,7 @@ function bindAddClusterButtonOnZonePage($button, zoneId, zoneName) {
array1.push("&podId="+podId);
var clusterName = trim($thisDialog.find("#cluster_name").val());
if(hypervisor == "VmWare" && clusterType != "CloudManaged") {
if(hypervisor == "VMware" && clusterType != "CloudManaged") {
var username = trim($thisDialog.find("#cluster_username").val());
array1.push("&username="+todb(username));
@ -675,7 +675,7 @@ function bindAddHostButtonOnZonePage($button, zoneId, zoneName) {
if(clusterId == null)
return;
var clusterObj = clustersUnderOnePod[clusterId];
if(clusterObj.hypervisortype == "VmWare") {
if(clusterObj.hypervisortype == "VMware") {
$('li[input_group="vmware"]', $dialogAddHost).show();
$('li[input_group="general"]', $dialogAddHost).hide();
} else {
@ -708,7 +708,7 @@ function bindAddHostButtonOnZonePage($button, zoneId, zoneName) {
if(clusterId != null) {
clusterObj = clustersUnderOnePod[clusterId];
hypervisor = clusterObj.hypervisortype;
if(hypervisor == "VmWare") {
if(hypervisor == "VMware") {
isValid &= validateString("vCenter Address", $thisDialog.find("#host_vcenter_address"), $thisDialog.find("#host_vcenter_address_errormsg"));
isValid &= validateString("vCenter User", $thisDialog.find("#host_vcenter_username"), $thisDialog.find("#host_vcenter_username_errormsg"));
isValid &= validateString("vCenter Password", $thisDialog.find("#host_vcenter_password"), $thisDialog.find("#host_vcenter_password_errormsg"));
@ -744,7 +744,7 @@ function bindAddHostButtonOnZonePage($button, zoneId, zoneName) {
var clustertype = clusterObj.clustertype;
array1.push("&clustertype=" + clustertype);
if(hypervisor == "VmWare") {
if(hypervisor == "VMware") {
var username = trim($thisDialog.find("#host_vcenter_username").val());
array1.push("&username="+todb(username));
@ -860,7 +860,7 @@ function bindAddPrimaryStorageButtonOnZonePage($button, zoneId, zoneName) {
$protocolSelector.empty();
$protocolSelector.append('<option value="nfs">NFS</option>');
$protocolSelector.append('<option value="iscsi">ISCSI</option>');
} else if(objCluster.hypervisortype == "VmWare") {
} else if(objCluster.hypervisortype == "VMware") {
$protocolSelector.empty();
$protocolSelector.append('<option value="nfs">NFS</option>');
$protocolSelector.append('<option value="vmfs">VMFS datastore</option>');