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/01/10 23:19:04 UTC
git commit: updated refs/heads/master to 96c6f6d
Updated Branches:
refs/heads/master 0d24d323c -> 96c6f6d15
CLOUDSTACK-5614: UI > Infrastructure > Sockets > show "N/A" in Socketes column for hypervisors that don't support socket info.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/96c6f6d1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/96c6f6d1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/96c6f6d1
Branch: refs/heads/master
Commit: 96c6f6d15dbed4b58e6a551815b640fad2dee467
Parents: 0d24d32
Author: Jessica Wang <je...@apache.org>
Authored: Fri Jan 10 14:17:38 2014 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Fri Jan 10 14:18:46 2014 -0800
----------------------------------------------------------------------
ui/scripts/system.js | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/96c6f6d1/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 7c0fb41..a9b1620 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -8422,6 +8422,13 @@
$.ajax({
url: createURL('listHypervisors'),
success: function (json) {
+ var supportSocketHypervisors = {
+ "Hyperv": 1,
+ "KVM": 1,
+ "XenServer": 1,
+ "VMware": 1
+ };
+
args.response.success({
data: $(json.listhypervisorsresponse.hypervisor).map(function (index, hypervisor) {
var totalHostCount = 0;
@@ -8466,6 +8473,10 @@
callListHostsWithPage(true);
+ if ((hypervisor.name in supportSocketHypervisors) == false) {
+ returnedHostCpusocketsSum = 'N/A';
+ }
+
return {
hypervisor: hypervisor.name,
hosts: totalHostCount,