CLOUDSTACK-6048: UI > Infrastructure > socket > listing > (1) remove LXC, OVM. (2) change XenServer label to differentiate XenServer version.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/04766c6d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/04766c6d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/04766c6d Branch: refs/heads/rbac Commit: 04766c6d476226192f663913cfaa911fc3ec29b2 Parents: 6212767 Author: Jessica Wang <jessicaw...@apache.org> Authored: Thu Feb 6 16:49:03 2014 -0800 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Thu Feb 6 16:55:39 2014 -0800 ---------------------------------------------------------------------- ui/scripts/system.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/04766c6d/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index ba5746e..7832bef 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -8464,7 +8464,7 @@ var array1 = []; // ***** non XenServer (begin) ***** - var hypervisors = ["Hyperv", "KVM", "VMware", "BareMetal", "Ovm", "LXC"]; + var hypervisors = ["Hyperv", "KVM", "VMware", "BareMetal"]; var supportSocketHypervisors = { "Hyperv": 1, @@ -8536,8 +8536,8 @@ var currentPage = 1; var returnedHostCount = 0; - var returnedHostCountForXenServer = 0; - var returnedHostCountForXenServer620 = 0; + var returnedHostCountForXenServer61x = 0; //'XenServer 6.1.x and before' + var returnedHostCountForXenServer620 = 0; //'XenServer 6.2.0' var returnedHostCpusocketsSumForXenServer620 = 0; var callListHostsWithPage = function() { @@ -8567,7 +8567,7 @@ returnedHostCpusocketsSumForXenServer620 += items[i].cpusockets; } } else { - returnedHostCountForXenServer++; + returnedHostCountForXenServer61x++; } } @@ -8582,8 +8582,8 @@ callListHostsWithPage(); array1.push({ - hypervisor: 'XenServer', - hosts: returnedHostCountForXenServer, + hypervisor: 'XenServer 6.1.x and before', + hosts: returnedHostCountForXenServer61x, sockets: 'N/A' });
