cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/4.5 to 6dc7712
Date Wed, 19 Nov 2014 23:12:14 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 50b262e02 -> 6dc771279


CLOUDSTACK-7613: UI > Infrastructure > CPU Sockets > add a new row for "XenServer
6.5.0".


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6dc77127
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6dc77127
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6dc77127

Branch: refs/heads/4.5
Commit: 6dc77127938c39c330f71cdc22b057ba64804aa7
Parents: 50b262e
Author: Jessica Wang <jessicawang@apache.org>
Authored: Wed Nov 19 15:11:01 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Wed Nov 19 15:11:01 2014 -0800

----------------------------------------------------------------------
 ui/scripts/system.js | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6dc77127/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 1029254..67c3a2a 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -9306,10 +9306,14 @@
                                 	var totalHostCount = 0;                                
               	
                                 	var currentPage = 1;
                                 	var returnedHostCount = 0;
+                                	                                	
+                                	var returnedHostCountForXenServer650 = 0;  //'XenServer
6.5.0'                               	
+                                	var returnedHostCpusocketsSumForXenServer650 = 0;    
                                 	
-                                	var returnedHostCountForXenServer61x = 0;  //'XenServer
6.1.x and before'
                                 	var returnedHostCountForXenServer620 = 0;  //'XenServer
6.2.0'                               	
-                                	var returnedHostCpusocketsSumForXenServer620 = 0;    
+                                	var returnedHostCpusocketsSumForXenServer620 = 0;   
+                                	
+                                	var returnedHostCountForXenServer61x = 0;  //'XenServer
6.1.x and before'
                                 	
                                 	var callListHostsWithPage = function() {               
                                		
                                 		$.ajax({
@@ -9330,9 +9334,13 @@
                                     			returnedHostCount += json.listhostsresponse.host.length;
                                     			                                                 
  			
                                     			var items = json.listhostsresponse.host;
-                                    			for (var i = 0; i < items.length; i++) {
-                                    				//"hypervisorversion" == "6.2.0"
-                                    				if (items[i].hypervisorversion == "6.2.0") {
+                                    			for (var i = 0; i < items.length; i++) {      
                             				
+                                    				if (items[i].hypervisorversion == "6.5.0") {
+                                    					returnedHostCountForXenServer650 ++;
+                                    					if (items[i].cpusockets != undefined &&
isNaN(items[i].cpusockets) == false) {
+                                        					returnedHostCpusocketsSumForXenServer650 +=
items[i].cpusockets;
+                                        				} 
+                                    				} else if (items[i].hypervisorversion == "6.2.0")
{
                                     					returnedHostCountForXenServer620 ++;
                                     					if (items[i].cpusockets != undefined &&
isNaN(items[i].cpusockets) == false) {
                                         					returnedHostCpusocketsSumForXenServer620 +=
items[i].cpusockets;
@@ -9353,9 +9361,9 @@
                                 	callListHostsWithPage();                               
	                                                  	
                                 	
                                 	array1.push({
-                                        hypervisor: 'XenServer 6.1.x and before',
-                                        hosts: returnedHostCountForXenServer61x,
-                                        sockets: 'N/A'                                  
                
+                                        hypervisor: 'XenServer 6.5.0',
+                                        hosts: returnedHostCountForXenServer650,
+                                        sockets: returnedHostCpusocketsSumForXenServer650
                                                   
                                     });
                                 	
                                 	array1.push({
@@ -9363,6 +9371,13 @@
                                         hosts: returnedHostCountForXenServer620,
                                         sockets: returnedHostCpusocketsSumForXenServer620
                                                   
                                     });
+                                	
+                                	array1.push({
+                                        hypervisor: 'XenServer 6.1.x and before',
+                                        hosts: returnedHostCountForXenServer61x,
+                                        sockets: 'N/A'                                  
                
+                                    });                                	
+                                	
                                 	// ***** XenServer (end) *****
                                 	
                                 	


Mime
View raw message