CLOUDSTACK-4308: UI > volume page > if hypervisor is KVM, show/hide takeSnapshot, recurringSnapshot action upon KVMsnapshotenabled property returned by listCapabilities API.

Jessica Wang · Jessica Wang · commit aa223e5786b8 · 2013-08-15T10:27:44.000-07:00
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
@@ -168,6 +168,11 @@
                             expires: 1
                         });
 
+                        g_KVMsnapshotenabled = json.listcapabilitiesresponse.capability.KVMsnapshotenabled; //boolean
+                        $.cookie('KVMsnapshotenabled', g_KVMsnapshotenabled, {
+                            expires: 1
+                        });                        
+                        
                         if (json.listcapabilitiesresponse.capability.userpublictemplateenabled != null) {
                             g_userPublicTemplateEnabled = json.listcapabilitiesresponse.capability.userpublictemplateenabled.toString(); //convert boolean to string if it's boolean
                             $.cookie('userpublictemplateenabled', g_userPublicTemplateEnabled, {
@@ -332,6 +337,11 @@
                                     expires: 1
                                 });
 
+                                g_KVMsnapshotenabled = json.listcapabilitiesresponse.capability.KVMsnapshotenabled; //boolean
+                                $.cookie('KVMsnapshotenabled', g_KVMsnapshotenabled, {
+                                    expires: 1
+                                });   
+                                
                                 if (json.listcapabilitiesresponse.capability.userpublictemplateenabled != null) {
                                     g_userPublicTemplateEnabled = json.listcapabilitiesresponse.capability.userpublictemplateenabled.toString(); //convert boolean to string if it's boolean
                                     $.cookie('userpublictemplateenabled', g_userPublicTemplateEnabled, {
@@ -432,6 +442,7 @@
                         g_timezoneoffset = null;
                         g_timezone = null;
                         g_supportELB = null;
+                        g_KVMsnapshotenabled = null;
                         g_loginCmdText = null;
 
                         $.cookie('JSESSIONID', null);
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
@@ -25,6 +25,7 @@ var g_enableLogging = false;
 var g_timezoneoffset = null;
 var g_timezone = null;
 var g_supportELB = null;
+var g_KVMsnapshotenabled =  null;
 var g_userPublicTemplateEnabled = "true";
 var g_cloudstackversion = null;
 var g_queryAsyncJobResultInterval = 3000;
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
@@ -1865,8 +1865,12 @@
         }
 
         if (jsonObj.hypervisor != "Ovm" && jsonObj.state == "Ready") {
-            allowedActions.push("takeSnapshot");
-            allowedActions.push("recurringSnapshot");
+        	if(jsonObj.hypervisor != 'KVM' 
+        		|| (jsonObj.hypervisor == 'KVM' && g_KVMsnapshotenabled == true) ) {
+	            allowedActions.push("takeSnapshot");
+	            allowedActions.push("recurringSnapshot");
+        	}            
+            
             if (jsonObj.type == "DATADISK") {
                 allowedActions.push("resize");
             }

Original file line number	Diff line number	Diff line change
`@@ -1865,8 +1865,12 @@`
`1865`	`1865`	`}`
`1866`	`1866`
`1867`	`1867`	`if (jsonObj.hypervisor != "Ovm" && jsonObj.state == "Ready") {`
`1868`		`- allowedActions.push("takeSnapshot");`
`1869`		`- allowedActions.push("recurringSnapshot");`
	`1868`	`+ if(jsonObj.hypervisor != 'KVM'`
	`1869`	`+ \|\| (jsonObj.hypervisor == 'KVM' && g_KVMsnapshotenabled == true) ) {`
	`1870`	`+ allowedActions.push("takeSnapshot");`
	`1871`	`+ allowedActions.push("recurringSnapshot");`
	`1872`	`+ }`
	`1873`	`+`
`1870`	`1874`	`if (jsonObj.type == "DATADISK") {`
`1871`	`1875`	`allowedActions.push("resize");`
`1872`	`1876`	`}`