Look at correct server information
Look at /xyz/openbmc_project/inventory/system for the server
information. Before the "server overview" page looked at the
BMC information for things like Server SerialNumber.
Resolves openbmc/openbmc#3095
Tested: Verified I see the correct server information now.
Change-Id: I562b28353d79fbf4a84e4c9a01db57d757a102a1
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/app/common/services/api-utils.js b/app/common/services/api-utils.js
index e74b196..1e28127 100644
--- a/app/common/services/api-utils.js
+++ b/app/common/services/api-utils.js
@@ -887,6 +887,19 @@
});
return deferred.promise;
},
+ getServerInfo: function(){
+ return $http({
+ method: 'GET',
+ url: DataService.getHost() + "/xyz/openbmc_project/inventory/system",
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json'
+ },
+ withCredentials: true
+ }).then(function(response){
+ return response.data;
+ });
+ },
getHardwares: function(callback){
$http({
method: 'GET',
diff --git a/app/overview/controllers/system-overview-controller.html b/app/overview/controllers/system-overview-controller.html
index 346e6e1..8b032d2 100644
--- a/app/overview/controllers/system-overview-controller.html
+++ b/app/overview/controllers/system-overview-controller.html
@@ -15,11 +15,11 @@
<ul class="overview__metadata-wrapper">
<li class="overview__metadata-block">
<p class="content-label">Model</p>
- <p class="courier-bold">{{bmc_info.Model}}</p>
+ <p class="courier-bold">{{server_info.Model}}</p>
</li>
<li class="overview__metadata-block">
<p class="content-label">Manufacturer</p>
- <p class="courier-bold">{{bmc_info.Manufacturer}}</p>
+ <p class="courier-bold">{{server_info.Manufacturer}}</p>
</li>
<li class="overview__metadata-block">
<p class="content-label">Firmware version</p>
@@ -27,7 +27,7 @@
</li>
<li class="overview__metadata-block">
<p class="content-label">Serial number</p>
- <p class="courier-bold">{{bmc_info.SerialNumber}}</p>
+ <p class="courier-bold">{{server_info.SerialNumber}}</p>
</li>
</ul>
</div>
diff --git a/app/overview/controllers/system-overview-controller.js b/app/overview/controllers/system-overview-controller.js
index 6c549fb..812218c 100644
--- a/app/overview/controllers/system-overview-controller.js
+++ b/app/overview/controllers/system-overview-controller.js
@@ -25,6 +25,7 @@
$scope.logs = [];
$scope.mac_address = "";
$scope.bmc_info = {};
+ $scope.server_info = {};
$scope.bmc_firmware = "";
$scope.server_firmware = "";
$scope.power_consumption = "";
@@ -40,6 +41,7 @@
led: APIUtils.getLEDState(),
ethernet: APIUtils.getBMCEthernetInfo(),
bmc_info: APIUtils.getBMCInfo(),
+ server_info: APIUtils.getServerInfo(),
power_consumption: APIUtils.getPowerConsumption(),
power_cap: APIUtils.getPowerCap(),
};
@@ -47,7 +49,7 @@
.then(function(data){
$scope.displayLogs(data.logs.data);
$scope.displayServerInfo(
- data.firmware.data,
+ data.server_info,
data.firmware.bmcActiveVersion,
data.firmware.hostActiveVersion
);
@@ -76,6 +78,7 @@
}
$scope.displayServerInfo = function(data, bmcActiveVersion, hostActiveVersion){
+ $scope.server_info = data.data;
$scope.bmc_firmware = bmcActiveVersion;
$scope.server_firmware = hostActiveVersion;
}