CLOUDSTACK-4428: KVMsnapshoteanbled property in listCapabilities API response has been renamed. Here is corresponding UI change.

Jessica Wang · Jessica Wang · commit 409cbd4c7abf · 2013-12-09T15:21:04.000-08:00
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
@@ -168,8 +168,8 @@
                             expires: 1
                         });
 
-                        g_KVMsnapshotenabled = json.listcapabilitiesresponse.capability.KVMsnapshotenabled; //boolean
-                        $.cookie('KVMsnapshotenabled', g_KVMsnapshotenabled, {
+                        g_kvmsnapshotenabled = json.listcapabilitiesresponse.capability.kvmsnapshotenabled; //boolean
+                        $.cookie('kvmsnapshotenabled', g_kvmsnapshotenabled, {
                             expires: 1
                         });                        
                                                
@@ -309,8 +309,8 @@
                                     expires: 1
                                 });
 
-                                g_KVMsnapshotenabled = json.listcapabilitiesresponse.capability.KVMsnapshotenabled; //boolean
-                                $.cookie('KVMsnapshotenabled', g_KVMsnapshotenabled, {
+                                g_kvmsnapshotenabled = json.listcapabilitiesresponse.capability.kvmsnapshotenabled; //boolean
+                                $.cookie('kvmsnapshotenabled', g_kvmsnapshotenabled, {
                                     expires: 1
                                 });   
                                 
@@ -386,7 +386,7 @@
                         g_timezoneoffset = null;
                         g_timezone = null;
                         g_supportELB = null;
-                        g_KVMsnapshotenabled = null;
+                        g_kvmsnapshotenabled = null;
                         g_regionsecondaryenabled = null;
                         g_loginCmdText = null;
 
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
@@ -2184,7 +2184,7 @@
         } else if (jsonObj.state == 'Running') {
             allowedActions.push("stop");
             allowedActions.push("restart");
-            if (jsonObj.hypervisor != 'KVM' || g_KVMsnapshotenabled == true)
+            if (jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true)
                 allowedActions.push("snapshot");
             allowedActions.push("destroy");            
             allowedActions.push("reset");
@@ -2214,7 +2214,7 @@
             allowedActions.push("start");
             allowedActions.push("destroy");
             allowedActions.push("reset");
-            if (jsonObj.hypervisor != 'KVM' || g_KVMsnapshotenabled == true)
+            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");
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
@@ -25,7 +25,7 @@ var g_enableLogging = false;
 var g_timezoneoffset = null;
 var g_timezone = null;
 var g_supportELB = null;
-var g_KVMsnapshotenabled =  null;
+var g_kvmsnapshotenabled =  null;
 var g_regionsecondaryenabled = null;
 var g_userPublicTemplateEnabled = "true";
 var g_cloudstackversion = null;
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
@@ -1920,7 +1920,7 @@
         if (jsonObj.hypervisor != "Ovm" && jsonObj.state == "Ready") {        	
         	if (jsonObj.hypervisor == 'KVM') { 
         		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)
+        			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");
             		}         			

Original file line number	Diff line number	Diff line change
`@@ -1920,7 +1920,7 @@`
`1920`	`1920`	`if (jsonObj.hypervisor != "Ovm" && jsonObj.state == "Ready") {`
`1921`	`1921`	`if (jsonObj.hypervisor == 'KVM') {`
`1922`	`1922`	`if (jsonObj.vmstate == 'Running') {`
`1923`		`- if (g_KVMsnapshotenabled == true) { //"kvm.snapshot.enabled" flag should be taken to account only when snapshot is being created for Running vm (CLOUDSTACK-4428)`
	`1923`	`+ if (g_kvmsnapshotenabled == true) { //"kvm.snapshot.enabled" flag should be taken to account only when snapshot is being created for Running vm (CLOUDSTACK-4428)`
`1924`	`1924`	`allowedActions.push("takeSnapshot");`
`1925`	`1925`	`allowedActions.push("recurringSnapshot");`
`1926`	`1926`	`}`