Display correct Power Consumption & Cap values
Current values are hard coded to '000 W'.
This fix is to do REST calls and display the correct values.
Resolves openbmc/openbmc#2735
Change-Id: I2f6766f1685a2bd52da62cda19998794f80270ec
Signed-off-by: CamVan Nguyen <ctnguyen@us.ibm.com>
diff --git a/app/overview/controllers/system-overview-controller.js b/app/overview/controllers/system-overview-controller.js
index 2382a2a..af70d15 100644
--- a/app/overview/controllers/system-overview-controller.js
+++ b/app/overview/controllers/system-overview-controller.js
@@ -28,6 +28,8 @@
$scope.bmc_info = {};
$scope.bmc_firmware = "";
$scope.server_firmware = "";
+ $scope.power_consumption = "";
+ $scope.power_cap = "";
$scope.loading = false;
loadOverviewData();
@@ -38,7 +40,9 @@
firmware: APIUtils.getFirmwares(),
led: APIUtils.getLEDState(),
ethernet: APIUtils.getBMCEthernetInfo(),
- bmc_info: APIUtils.getBMCInfo()
+ bmc_info: APIUtils.getBMCInfo(),
+ power_consumption: APIUtils.getPowerConsumption(),
+ power_cap: APIUtils.getPowerCap(),
};
$q.all(promises)
.then(function(data){
@@ -51,6 +55,8 @@
$scope.displayLEDState(data.led);
$scope.displayBMCEthernetInfo(data.ethernet);
$scope.displayBMCInfo(data.bmc_info);
+ $scope.displayPowerConsumption(data.power_consumption);
+ $scope.displayPowerCap(data.power_cap);
})
.finally(function(){
$scope.loading = false;
@@ -92,6 +98,14 @@
});
}
+ $scope.displayPowerConsumption = function(data){
+ $scope.power_consumption = data;
+ }
+
+ $scope.displayPowerCap = function(data){
+ $scope.power_cap = data;
+ }
+
var refreshDataListener = $rootScope.$on('refresh-data', function(event, args) {
loadOverviewData();
});