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

CLOUDSTACK-7261: related UI change after lsitSystemVMs/listRouters API were fixed to return hypervisor property while state is running.

Browse Source
This commit is contained in:
Jessica Wang 2014-09-09 15:18:49 -07:00
parent 9b65759f36
commit 07c9c02789
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ui/scripts/system.js
View File

@ -20510,15 +20510,11 @@
if (jsonObj.state == 'Running') {
allowedActions.push("stop");
//when systemVm is running, scaleUp is not supported for KVM and XenServer.
//however, listRouters API doesn't return hypervisor property....
/*
if (jsonObj.hypervisor != 'KVM' && jsonObj.hypervisor != 'XenServer') {
allowedActions.push("scaleUp");
}
*/
allowedActions.push("scaleUp");
//when router is Running, only XenServer, VMware support scaleUp(change service offering)
if (jsonObj.hypervisor == 'XenServer' || jsonObj.hypervisor == "VMware") {
allowedActions.push("scaleUp");
}
allowedActions.push("restart");
@ -20527,8 +20523,10 @@
allowedActions.push("migrate");
} else if (jsonObj.state == 'Stopped') {
allowedActions.push("start");
//when router is Stopped, all hypervisors support scaleUp(change service offering)
allowedActions.push("scaleUp");
//when vm is stopped, scaleUp is supported for all hypervisors
allowedActions.push("remove");
}
return allowedActions;
@ -20559,22 +20557,20 @@
allowedActions.push("restart");
allowedActions.push("remove");
//when systemVm is running, scaleUp is not supported for KVM and XenServer.
//however, listSystemVms API doesn't return hypervisor property....
/*
if (jsonObj.hypervisor != 'KVM' && jsonObj.hypervisor != 'XenServer') {
allowedActions.push("scaleUp");
//when systemvm is Running, only XenServer, VMware support scaleUp(change service offering)
if (jsonObj.hypervisor == 'XenServer' ||jsonObj.hypervisor == "VMware") {
allowedActions.push("scaleUp");
}
*/
allowedActions.push("scaleUp");
allowedActions.push("viewConsole");
if (isAdmin())
allowedActions.push("migrate");
} else if (jsonObj.state == 'Stopped') {
allowedActions.push("start");
//when systemvm is Stopped, all hypervisors support scaleUp(change service offering)
allowedActions.push("scaleUp");
//when vm is stopped, scaleUp is supported for all hypervisors
allowedActions.push("remove");
} else if (jsonObj.state == 'Error') {
allowedActions.push("remove");