diff options
| author | CamVan Nguyen <ctnguyen@us.ibm.com> | 2018-05-02 13:33:51 -0500 |
|---|---|---|
| committer | Gunnar Mills <gmills@us.ibm.com> | 2018-05-13 10:26:47 +0000 |
| commit | fbb63db499eadba214d368977b08af6ee9330f7f (patch) | |
| tree | f2e38be7d925fa742668d4771c8f48042751d31f /app/overview/controllers | |
| parent | 58301ec8b6c533d28863f03d96f0c3006f4cfa38 (diff) | |
| download | phosphor-webui-fbb63db499eadba214d368977b08af6ee9330f7f.tar.gz phosphor-webui-fbb63db499eadba214d368977b08af6ee9330f7f.zip | |
Display ip addresses in 'BMC information' section
BMC Host/IP Address is already displayed in the header.
So in the 'BMC information' section, just display the
BMC's ip addresses. There could be multiple ip addresses.
Resolves openbmc/openbmc#3148
Change-Id: I4efdf4f1df2fc70d32dd659ae57b6bb7ba0fa0f4
Signed-off-by: CamVan Nguyen <ctnguyen@us.ibm.com>
Diffstat (limited to 'app/overview/controllers')
| -rw-r--r-- | app/overview/controllers/system-overview-controller.html | 4 | ||||
| -rw-r--r-- | app/overview/controllers/system-overview-controller.js | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/app/overview/controllers/system-overview-controller.html b/app/overview/controllers/system-overview-controller.html index 295aac6..f6c91c3 100644 --- a/app/overview/controllers/system-overview-controller.html +++ b/app/overview/controllers/system-overview-controller.html @@ -45,8 +45,8 @@ <p class="courier-bold overview__hostname">{{dataService.hostname}}</p> </li> <li class="overview__metadata-block"> - <p class="content-label">BMC Host/IP address</p> - <p class="courier-bold">{{dataService.server_id}}</p> + <p class="content-label">IP addresses</p> + <p class="courier-bold" ng-repeat="ip_address in bmc_ip_addresses">{{ip_address}}</p> </li> <li class="overview__metadata-block"> <p class="content-label">Firmware Version</p> diff --git a/app/overview/controllers/system-overview-controller.js b/app/overview/controllers/system-overview-controller.js index 87fcf4e..c98f98e 100644 --- a/app/overview/controllers/system-overview-controller.js +++ b/app/overview/controllers/system-overview-controller.js @@ -30,6 +30,7 @@ window.angular && (function (angular) { $scope.server_firmware = ""; $scope.power_consumption = ""; $scope.power_cap = ""; + $scope.bmc_ip_addresses = []; $scope.loading = false; loadOverviewData(); @@ -45,6 +46,7 @@ window.angular && (function (angular) { server_info: APIUtils.getServerInfo(), power_consumption: APIUtils.getPowerConsumption(), power_cap: APIUtils.getPowerCap(), + network_info: APIUtils.getNetworkInfo(), }; $q.all(promises) .then(function(data){ @@ -62,6 +64,7 @@ window.angular && (function (angular) { $scope.displayBMCTime(data.bmc_time); $scope.displayPowerConsumption(data.power_consumption); $scope.displayPowerCap(data.power_cap); + $scope.displayNetworkInfo(data.network_info); }) .finally(function(){ $scope.loading = false; @@ -115,6 +118,13 @@ window.angular && (function (angular) { $scope.displayPowerCap = function(data){ $scope.power_cap = data; } + + $scope.displayNetworkInfo = function(data){ + // TODO: openbmc/openbmc#3150 Support IPV6 when officially + // supported by the backend + $scope.bmc_ip_addresses = + data.formatted_data.ip_addresses.ipv4; + } } ] ); |

