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

[UI] kvm vm snapshot not shown if kvm.snapshot.enabled is set to false 

(cherry picked from commit 64c03dbc31)
This commit is contained in:
Wei Zhou 2013-11-28 10:47:37 +01:00
parent 37866b4a42
commit 3a3ed76ae4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/scripts/instances.js
View File

@ -2092,7 +2092,8 @@
} else if (jsonObj.state == 'Running') {
allowedActions.push("stop");
allowedActions.push("restart");
allowedActions.push("snapshot");
if (jsonObj.hypervisor != 'KVM' || g_KVMsnapshotenabled == true)
allowedActions.push("snapshot");
allowedActions.push("destroy");
allowedActions.push("reset");
@ -2121,7 +2122,8 @@
allowedActions.push("start");
allowedActions.push("destroy");
allowedActions.push("reset");
allowedActions.push("snapshot");
if (jsonObj.hypervisor != 'KVM' || g_KVMsnapshotenabled == true)
allowedActions.push("snapshot");
allowedActions.push("scaleUp"); //when vm is stopped, scaleUp is supported for all hypervisors
allowedActions.push("changeAffinity");

2
ui/scripts/storage.js
View File

@ -1866,7 +1866,7 @@
if (jsonObj.hypervisor != "Ovm" && jsonObj.state == "Ready") {
if (jsonObj.hypervisor == 'KVM') {
if (json.vmstate == 'Running') {
if (jsonObj.vmstate == 'Running') {
if (g_KVMsnapshotenabled == true) { //"kvm.snapshot.enabled" flag should be taken to account only when snapshot is being created for Running vm (CLOUDSTACK-4428)
allowedActions.push("takeSnapshot");
allowedActions.push("recurringSnapshot");