1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
|
diff --git a/app/common/services/api-utils.js b/app/common/services/api-utils.js
index 7643a4e..df0e7cf 100644
--- a/app/common/services/api-utils.js
+++ b/app/common/services/api-utils.js
@@ -1488,22 +1488,42 @@ window.angular && (function(angular) {
});
return $q.all(promises);
},
- getPowerConsumption: function() {
+ getCPUPowerConsumption: function() {
return $http({
method: 'GET',
url: DataService.getHost() +
- '/xyz/openbmc_project/sensors/power/total_power',
+ '/xyz/openbmc_project/sensors/power/p0_power',
withCredentials: true
})
.then(
function(response) {
var json = JSON.stringify(response.data);
var content = JSON.parse(json);
+ var first_cpu_data = content.data;
- return getScaledValue(
- content.data.Value, content.data.Scale) +
- ' ' +
- Constants.POWER_CONSUMPTION_TEXT[content.data.Unit];
+ return $http({
+ method: 'GET',
+ url: DataService.getHost() +
+ '/xyz/openbmc_project/sensors/power/p1_power',
+ withCredentials: true
+ })
+ .then(
+ function(response) {
+ var json = JSON.stringify(response.data);
+ var content = JSON.parse(json);
+ var second_cpu_value = content.data.Value;
+
+ return getScaledValue(
+ first_cpu_data.Value + second_cpu_value, first_cpu_data.Scale) +
+ ' ' +
+ Constants.POWER_CONSUMPTION_TEXT[first_cpu_data.Unit];
+ },
+ function(error) {
+ return getScaledValue(
+ first_cpu_data.Value, first_cpu_data.Scale) +
+ ' ' +
+ Constants.POWER_CONSUMPTION_TEXT[first_cpu_data.Unit];
+ });
},
function(error) {
if ('Not Found' == error.statusText) {
diff --git a/app/overview/controllers/system-overview-controller.html b/app/overview/controllers/system-overview-controller.html
index 629e0ab..03644c6 100644
--- a/app/overview/controllers/system-overview-controller.html
+++ b/app/overview/controllers/system-overview-controller.html
@@ -83,8 +83,8 @@
<ul class="overview__metadata-wrapper">
<li class="overview__metadata-block">
<dl>
- <dt class="content-label">Power Consumption</dt>
- <dd class="courier-bold">{{power_consumption}}</dd>
+ <dt class="content-label">CPU Power Consumption</dt>
+ <dd class="courier-bold">{{cpu_power_consumption}}</dd>
</dl>
</li>
<li class="overview__metadata-block">
diff --git a/app/overview/controllers/system-overview-controller.js b/app/overview/controllers/system-overview-controller.js
index 0b7d2f0..b466b6a 100644
--- a/app/overview/controllers/system-overview-controller.js
+++ b/app/overview/controllers/system-overview-controller.js
@@ -19,7 +19,7 @@ window.angular && (function(angular) {
$scope.bmc_firmware = '';
$scope.bmc_time = '';
$scope.server_firmware = '';
- $scope.power_consumption = '';
+ $scope.cpu_power_consumption = '';
$scope.power_cap = '';
$scope.bmc_ip_addresses = [];
$scope.loading = false;
@@ -77,9 +77,9 @@ window.angular && (function(angular) {
console.log(JSON.stringify(error));
});
- var getPowerConsumptionPromise = APIUtils.getPowerConsumption().then(
+ var getCPUPowerConsumptionPromise = APIUtils.getCPUPowerConsumption().then(
function(data) {
- $scope.power_consumption = data;
+ $scope.cpu_power_consumption = data;
},
function(error) {
console.log(JSON.stringify(error));
@@ -114,7 +114,7 @@ window.angular && (function(angular) {
getLEDStatePromise,
getBMCTimePromise,
getServerInfoPromise,
- getPowerConsumptionPromise,
+ getCPUPowerConsumptionPromise,
getPowerCapPromise,
getNetworkInfoPromise,
];
diff --git a/app/server-control/controllers/power-usage-controller.html b/app/server-control/controllers/power-usage-controller.html
index 62ca3da..273cf9b 100644
--- a/app/server-control/controllers/power-usage-controller.html
+++ b/app/server-control/controllers/power-usage-controller.html
@@ -11,8 +11,8 @@
<fieldset>
<ul class="power-usage__metadata-wrapper">
<li class="power-usage__metadata-block">
- <p class="content-label">Power Consumption</p>
- <p class="courier-bold">{{power_consumption}}</p>
+ <p class="content-label">CPU Power Consumption</p>
+ <p class="courier-bold">{{cpu_power_consumption}}</p>
</li>
<li class="power-usage__metadata-block">
<div class="toggle inline">
diff --git a/app/server-control/controllers/power-usage-controller.js b/app/server-control/controllers/power-usage-controller.js
index 9398259..bb2bf0d 100644
--- a/app/server-control/controllers/power-usage-controller.js
+++ b/app/server-control/controllers/power-usage-controller.js
@@ -12,7 +12,7 @@ window.angular && (function(angular) {
angular.module('app.serverControl').controller('powerUsageController', [
'$scope', '$window', 'APIUtils', '$route', '$q', 'toastService',
function($scope, $window, APIUtils, $route, $q, toastService) {
- $scope.power_consumption = '';
+ $scope.cpu_power_consumption = '';
$scope.power_cap = {};
$scope.loading = false;
loadPowerData();
@@ -28,16 +28,16 @@ window.angular && (function(angular) {
console.log(JSON.stringify(error));
});
- var getPowerConsumptionPromise = APIUtils.getPowerConsumption().then(
+ var getCPUPowerConsumptionPromise = APIUtils.getCPUPowerConsumption().then(
function(data) {
- $scope.power_consumption = data;
+ $scope.cpu_power_consumption = data;
},
function(error) {
console.log(JSON.stringify(error));
});
var promises = [
- getPowerConsumptionPromise,
+ getCPUPowerConsumptionPromise,
getPowerCapPromise,
];
|
