From 98bb24ebe5411a25440f9748168b72272304d50e Mon Sep 17 00:00:00 2001 From: Yoshie Muranaka Date: Tue, 6 Oct 2020 10:00:19 -0700 Subject: Add two file firmware update Adds the ability to upload separate Host and BMC firmware images through the GUI. By default, the two file firmware update page will be shown. Changes to the .env configurations will enable the single file upload page. The IBM env is configured to allow single file firmware update. Two file upload features: - File upload through local workstation or tftp server - Reboot from backup BMC image - Does not have ability to reboot from backup host image - Does not implement checks in GUI for host status, which is the same as what we have in phosphor-webui Signed-off-by: Yoshie Muranaka Change-Id: Ibf2a2d9ffc3952dd5a5454c723350c61d9f91c3e --- src/locales/en-US.json | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'src/locales') diff --git a/src/locales/en-US.json b/src/locales/en-US.json index 7a4672d6..ea88e5ad 100644 --- a/src/locales/en-US.json +++ b/src/locales/en-US.json @@ -199,9 +199,13 @@ "changeAndRebootBmc": "Change image and reboot BMC", "changeToBackupImage": "Change to backup image", "current": "Current:", + "firmwareOnBmc": "Firmware on BMC", + "firmwareOnHost": "Firmware on host", "firmwareOnSystem": "Firmware on system", "hostStatus": "Host status", - "pageDescription": "Update firmware by uploading a system image file from your workstation or TFTP server", + "makeCurrentVersion": "Make current version", + "pageDescription": "Update firmware by uploading a BMC or Host image file from your workstation or TFTP server", + "pageDescriptionSingleImage": "Update firmware by uploading a system image file from your workstation or TFTP server", "running": "Running", "state": "State", "updateCode": "Update code", @@ -211,7 +215,8 @@ "serverShutdownRequiredInfo": "Shutdown will be orderly - OS will shutdown before the server shuts down.", "shutDownServer": "Shut down server", "updateProcess": "Update process", - "updateProcessInfo": "The new image will be uploaded and activated. After that, the BMC will reboot automatically to run from the new image." + "updateProcessInfo": "The new image will be uploaded and activated. After that, the BMC or host will reboot automatically to run from the new image.", + "updateProcessInfoSingleImage": "The new image will be uploaded and activated. After that, the BMC will reboot automatically to run from the new image." }, "form": { "imageFile": "Image file", @@ -221,6 +226,7 @@ "tftpServerAddress": "TFTP server address", "tftpServerAddressHelper": "IP address or FQDN", "uploadAndRebootBmc": "Upload and reboot BMC", + "uploadAndRebootBmcOrHost": "Upload and reboot BMC or host", "uploadLocation": "Upload location", "workstation": "Workstation" }, @@ -236,12 +242,19 @@ "primaryAction": "Reboot BMC from backup image", "title": "@:pageFirmware.modal.connectionToBmcWillBeLost" }, - "uploadAndReboot": { + "uploadAndRebootSingleImage": { "message1": "A BMC reboot is required before the system can run the new firmware image. The reboot will cause a disconnection, and may require logging in again.", "message2": "During the reboot, the server cannot be powered back on. The backup image will be permanently deleted.", "message3": "Are you sure you want to upload the new firmware image and reboot the BMC?", "primaryAction": "Upload and reboot BMC", "title": "@:pageFirmware.modal.connectionToBmcWillBeLost" + }, + "uploadAndRebootBmcOrHost": { + "message1": "A BMC or host reboot is required before the system can run the new firmware image. The reboot will cause a disconnection, and may require logging in again.", + "message2": "The backup image will be permanently deleted.", + "message3": "Are you sure you want to upload the new firmware image and reboot the BMC or host?", + "primaryAction": "Upload and reboot BMC or host", + "title": "Connection to BMC or host will be lost" } }, "toast": { -- cgit v1.2.3