You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2014/11/20 00:13:05 UTC
git commit: updated refs/heads/master to e32eec8
Repository: cloudstack
Updated Branches:
refs/heads/master bb352da30 -> e32eec8b3
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/e32eec8b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e32eec8b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e32eec8b
Branch: refs/heads/master
Commit: e32eec8b3eacd1d90f706946d8d0c5248fbd8bcd
Parents: bb352da
Author: Jessica Wang <je...@apache.org>
Authored: Wed Nov 19 15:11:01 2014 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Wed Nov 19 15:12:50 2014 -0800
----------------------------------------------------------------------
ui/scripts/system.js | 31 +++++++++++++++++++++++--------
1 file changed, 23 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e32eec8b/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index f281265..c8a5bb8 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -9318,10 +9318,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({
@@ -9342,9 +9346,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;
@@ -9365,9 +9373,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({
@@ -9375,6 +9383,13 @@
hosts: returnedHostCountForXenServer620,
sockets: returnedHostCpusocketsSumForXenServer620
});
+
+ array1.push({
+ hypervisor: 'XenServer 6.1.x and before',
+ hosts: returnedHostCountForXenServer61x,
+ sockets: 'N/A'
+ });
+
// ***** XenServer (end) *****