apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 10:32:34 +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));
if(args.data.cluster.hypervisor == "VMware"){
var vmwareData = {
zoneId: args.data.returnedZone.id,
username: args.data.cluster.vCenterUsername,
password: args.data.cluster.vCenterPassword,
name: args.data.cluster.vCenterDatacenter
};
$.ajax({
url: createURL('addVmwareDc&url=' + todb(url)),
data: vmwareData,
success: function(json) {
var item = json.addvmwaredcresponse.vmwaredc;
if(item.id != null){
$.ajax({
url: createURL("addCluster" + array1.join("")),
dataType: "json",
async: true,
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 });
}
});
}
}
});
}
if(args.data.cluster.hypervisor == "VMware"){
var vmwareData = {
zoneId: args.data.returnedZone.id,
username: args.data.cluster.vCenterUsername,
password: args.data.cluster.vCenterPassword,
name: args.data.cluster.vCenterDatacenter
};
$.ajax({
url: createURL('addVmwareDc&url=' + todb(url)),
data: vmwareData,
success: function(json) {
var item = json.addvmwaredcresponse.vmwaredc;
if(item.id != null){
$.ajax({
url: createURL("addCluster" + array1.join("")),
dataType: "json",
async: true,
success: function(json) {
stepFns.addPrimaryStorage({ //skip "add host step" when hypervisor is VMware
data: $.extend(args.data, {
returnedCluster: json.addclusterresponse.cluster[0]
})
});
},
error: function(XMLHttpResponse) {
var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
error('addCluster', errorMsg, { fn: 'addCluster', args: args });
}
});
}
}
});
}
else{
$.ajax({
url: createURL("addCluster" + array1.join("")),
dataType: "json",
async: true,
success: function(json) {
if(args.data.cluster.hypervisor != "VMware") {
stepFns.addHost({
data: $.extend(args.data, {
returnedCluster: json.addclusterresponse.cluster[0]
})
});
}
else {
stepFns.addPrimaryStorage({
data: $.extend(args.data, {
returnedCluster: json.addclusterresponse.cluster[0]
})
});
}
stepFns.addHost({
data: $.extend(args.data, {
returnedCluster: json.addclusterresponse.cluster[0]
})
});
},
error: function(XMLHttpResponse) {
var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
error('addCluster', errorMsg, { fn: 'addCluster', args: args });
}
});
}
},