apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-18 03:23:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-2782: UI - zone wizard - add cluster step - remove obsolete code.

Browse Source
This commit is contained in:
Jessica Wang 2013-06-04 16:20:34 -07:00
parent 86c0e28c04
commit 402cc917b9
1 changed files with 38 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
ui/scripts/zoneWizard.js
View File

@ -3361,75 +3361,56 @@
} }
array1.push("&clustername=" + todb(clusterName)); array1.push("&clustername=" + todb(clusterName));
if(args.data.cluster.hypervisor == "VMware"){ if(args.data.cluster.hypervisor == "VMware"){
var vmwareData = {
var vmwareData = { zoneId: args.data.returnedZone.id,
username: args.data.cluster.vCenterUsername,
zoneId: args.data.returnedZone.id, password: args.data.cluster.vCenterPassword,
username: args.data.cluster.vCenterUsername, name: args.data.cluster.vCenterDatacenter
password: args.data.cluster.vCenterPassword, };
name: args.data.cluster.vCenterDatacenter $.ajax({
url: createURL('addVmwareDc&url=' + todb(url)),
}; data: vmwareData,
success: function(json) {
$.ajax({ var item = json.addvmwaredcresponse.vmwaredc;
url: createURL('addVmwareDc&url=' + todb(url)), if(item.id != null){
data: vmwareData, $.ajax({
success: function(json) { url: createURL("addCluster" + array1.join("")),
var item = json.addvmwaredcresponse.vmwaredc; dataType: "json",
if(item.id != null){ async: true,
$.ajax({ success: function(json) {
url: createURL("addCluster" + array1.join("")), stepFns.addPrimaryStorage({ //skip "add host step" when hypervisor is VMware
dataType: "json", data: $.extend(args.data, {
async: true, returnedCluster: json.addclusterresponse.cluster[0]
success: function(json) { })
stepFns.addPrimaryStorage({ });
data: $.extend(args.data, { },
returnedCluster: json.addclusterresponse.cluster[0] error: function(XMLHttpResponse) {
}) var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
}); error('addCluster', errorMsg, { fn: 'addCluster', args: args });
}
}, });
error: function(XMLHttpResponse) { }
var errorMsg = parseXMLHttpResponse(XMLHttpResponse); }
error('addCluster', errorMsg, { fn: 'addCluster', args: args }); });
} }
});
}
}
});
}
else{ else{
$.ajax({ $.ajax({
url: createURL("addCluster" + array1.join("")), url: createURL("addCluster" + array1.join("")),
dataType: "json", dataType: "json",
async: true, async: true,
success: function(json) { success: function(json) {
if(args.data.cluster.hypervisor != "VMware") { stepFns.addHost({
stepFns.addHost({ data: $.extend(args.data, {
data: $.extend(args.data, { returnedCluster: json.addclusterresponse.cluster[0]
returnedCluster: json.addclusterresponse.cluster[0] })
}) });
});
}
else {
stepFns.addPrimaryStorage({
data: $.extend(args.data, {
returnedCluster: json.addclusterresponse.cluster[0]
})
});
}
}, },
error: function(XMLHttpResponse) { error: function(XMLHttpResponse) {
var errorMsg = parseXMLHttpResponse(XMLHttpResponse); var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
error('addCluster', errorMsg, { fn: 'addCluster', args: args }); error('addCluster', errorMsg, { fn: 'addCluster', args: args });
} }
}); });
} }
}, },