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-4428: UI > volume > take snapshot action, recurring snapshot action > for volumes whose hypervisor is KVM and whose VM is not Running, always show the 2 actions regardless value of "kvm.snapshot.enabled".

Browse Source
This commit is contained in:
Jessica Wang 2013-11-26 15:04:08 -08:00
parent 2145505d30
commit 8ce6d5271c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/scripts/storage.js
View File

@ -1896,13 +1896,14 @@
if (jsonObj.hypervisor != "Ovm" && jsonObj.state == "Ready") { if (jsonObj.hypervisor != "Ovm" && jsonObj.state == "Ready") {
if (jsonObj.hypervisor == 'KVM') { if (jsonObj.hypervisor == 'KVM') {
if (g_KVMsnapshotenabled == true) { if (json.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("takeSnapshot");
allowedActions.push("recurringSnapshot"); allowedActions.push("recurringSnapshot");
} else {
if(jsonObj.vmstate == 'Stopped' || jsonObj.virtualmachineid == undefined) { //volume of stopped VM, or detached volume
allowedActions.push("takeSnapshot");
} }
} else {
allowedActions.push("takeSnapshot");
allowedActions.push("recurringSnapshot");
} }
} else { } else {
allowedActions.push("takeSnapshot"); allowedActions.push("takeSnapshot");