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

explicit dedication API-UI integration

This commit is contained in:
Pranav Saxena 2013-05-24 17:35:48 +05:30
parent 336baebfa6
commit a1cd244a12
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/scripts/system.js
View File

@ -8037,12 +8037,14 @@
var endip = args.data.reservedSystemEndIp; //optional
if (endip != null && endip.length > 0)
array1.push("&endIp=" + todb(endip));
var podId = null;
$.ajax({
url: createURL("createPod" + array1.join("")),
dataType: "json",
success: function(json) {
var item = json.createpodresponse.pod;
podId = json.createpodresponse.pod.id;
/* args.response.success({
data:item
});
@ -8064,8 +8066,17 @@
url:createURL("dedicatePod&podId=" +podId +"&domainId=" +args.data.domainId + array2.join("")),
dataType:"json",
success:function(json){
var dedicatedObj = json.dedicatepodresponse.pod;
args.response.success({ data: $.extend(item, dedicatedObj)});
var jid = json.dedicatepodresponse.jobid;
args.response.success({
_custom:
{ jobId: jid
},
notification: {
poll: pollAsyncJobResult
},
data:item
});
},
@ -8919,12 +8930,12 @@
array2.push("&accountId=" +todb(args.data.accountId));
}
if(hostId != null){
if(clusterId != null){
$.ajax({
url:createURL("dedicateCluster&clusterId=" +clusterId +"&domainId=" +args.data.domainId + array2.join("")),
dataType:"json",
success:function(json){
var dedicatedObj = json.dedicateclusterresponse.cluster;
var jid = json.dedicateclusterresponse.jobid;
args.response.success({ data: $.extend(item, dedicatedObj , {state:'Enabled'}) });
},

6
ui/scripts/zoneWizard.js
View File

@ -1605,7 +1605,7 @@
if(args.data.zone.networkdomain != null && args.data.zone.networkdomain.length > 0)
array1.push("&domain=" + todb(args.data.zone.networkdomain));
var dedicatedZoneid = null;
var dedicatedZoneId = null;
$.ajax({
url: createURL("createZone" + array1.join("")),
@ -1627,10 +1627,10 @@
if(dedicatedZoneId != null){
$.ajax({
url:createURL("dedicateZone&ZoneId=" +ZoneId +"&domain=" +args.data.zone.domain + array2.join("")),
url:createURL("dedicateZone&ZoneId=" +dedicatedZoneId +"&domain=" +args.data.zone.domain + array2.join("")),
dataType:"json",
success:function(json){
var dedicatedObj = json.dedicatezoneresponse.zone;
var dedicatedObj = json.dedicatezoneresponse.jobid;
//args.response.success({ data: $.extend(item, dedicatedObj)});
},