apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-2236: UI - Instances menu - migrate instance to another host - get requiresStorageMotion property from selected option instead of first option from host dropdown.

Browse Source
This commit is contained in:
Jessica Wang 2013-06-21 10:28:15 -07:00
parent 933e4e6dff
commit 31b9fea5e7
1 changed files with 69 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
ui/scripts/instances.js
View File

@ -15,7 +15,7 @@
// specific language governing permissions and limitations // specific language governing permissions and limitations
// under the License. // under the License.
(function($, cloudStack) { (function($, cloudStack) {
var requiresStorageMotion = false; var vmMigrationHostObjs;
cloudStack.sections.instances = { cloudStack.sections.instances = {
title: 'label.instances', title: 'label.instances',
id: 'instances', id: 'instances',
@ -1079,30 +1079,26 @@
select: function(args) { select: function(args) {
$.ajax({ $.ajax({
url: createURL("findHostsForMigration&VirtualMachineId=" + args.context.instances[0].id), url: createURL("findHostsForMigration&VirtualMachineId=" + args.context.instances[0].id),
//url: createURL("listHosts"), //for testing only, comment it out before checking in.
dataType: "json", dataType: "json",
async: true, async: true,
success: function(json) { success: function(json) {
if(json.findhostsformigrationresponse.host != undefined){ if(json.findhostsformigrationresponse.host != undefined) {
var hosts = json.findhostsformigrationresponse.host; vmMigrationHostObjs = json.findhostsformigrationresponse.host;
requiresStorageMotion = json.findhostsformigrationresponse.host[0].requiresStorageMotion; var items = [];
var items = []; $(vmMigrationHostObjs).each(function() {
$(hosts).each(function() { if(this.requiresStorageMotion == true){
if(this.requiresStorageMotion == true){ items.push({id: this.id, description: (this.name + " (" + (this.suitableformigration? "Suitable, ": "Not Suitable, ") + "Storage migration required)" )});
items.push({id: this.id, description: (this.name + " (" + (this.suitableformigration? "Suitable, ": "Not Suitable, ") + "Storage migration required)" )});
}
else {
items.push({id: this.id, description: (this.name + " (" + (this.suitableformigration? "Suitable": "Not Suitable") + ")" )});
}
});
args.response.success({data: items});
} }
else { else {
items.push({id: this.id, description: (this.name + " (" + (this.suitableformigration? "Suitable": "Not Suitable") + ")" )});
}
});
args.response.success({data: items});
}
else
cloudStack.dialog.notice({ message: _l('No Hosts are avaialble for Migration') }); //Only a single host in the set up cloudStack.dialog.notice({ message: _l('No Hosts are avaialble for Migration') }); //Only a single host in the set up
}
} }
}); });
} }
@ -1110,51 +1106,61 @@
} }
}, },
action: function(args) { action: function(args) {
var selectedHostObj;
if(requiresStorageMotion == true){ if(vmMigrationHostObjs != null) {
$.ajax({ for(var i = 0; i < vmMigrationHostObjs.length; i++) {
url: createURL("migrateVirtualMachineWithVolume&hostid=" + args.data.hostId + "&virtualmachineid=" + args.context.instances[0].id), if(vmMigrationHostObjs[i].id == args.data.hostId) {
dataType: "json", selectedHostObj = vmMigrationHostObjs[i];
async: true, break;
success: function(json) { }
var jid = json.migratevirtualmachinewithvolumeresponse.jobid;
args.response.success(
{_custom:
{jobId: jid,
getUpdatedItem: function(json) {
return json.queryasyncjobresultresponse.jobresult.virtualmachine;
},
getActionFilter: function() {
return vmActionfilter;
}
}
}
);
} }
}); }
} if(selectedHostObj == null)
else{ return;
$.ajax({
url: createURL("migrateVirtualMachine&hostid=" + args.data.hostId + "&virtualmachineid=" + args.context.instances[0].id),
dataType: "json",
async: true,
success: function(json) {
var jid = json.migratevirtualmachineresponse.jobid;
args.response.success(
{_custom:
{jobId: jid,
getUpdatedItem: function(json) {
return json.queryasyncjobresultresponse.jobresult.virtualmachine;
},
getActionFilter: function() {
return vmActionfilter;
}
}
}
);
}
});
if(selectedHostObj.requiresStorageMotion == true){
$.ajax({
url: createURL("migrateVirtualMachineWithVolume&hostid=" + args.data.hostId + "&virtualmachineid=" + args.context.instances[0].id),
dataType: "json",
async: true,
success: function(json) {
var jid = json.migratevirtualmachinewithvolumeresponse.jobid;
args.response.success(
{_custom:
{jobId: jid,
getUpdatedItem: function(json) {
return json.queryasyncjobresultresponse.jobresult.virtualmachine;
},
getActionFilter: function() {
return vmActionfilter;
}
}
}
);
}
});
}
else{
$.ajax({
url: createURL("migrateVirtualMachine&hostid=" + args.data.hostId + "&virtualmachineid=" + args.context.instances[0].id),
dataType: "json",
async: true,
success: function(json) {
var jid = json.migratevirtualmachineresponse.jobid;
args.response.success(
{_custom:
{jobId: jid,
getUpdatedItem: function(json) {
return json.queryasyncjobresultresponse.jobresult.virtualmachine;
},
getActionFilter: function() {
return vmActionfilter;
}
}
}
);
}
});
} }
}, },
notification: { notification: {