From 0b980dbfe69e1b3f59d5b26e83d16ecbdab95ecb Mon Sep 17 00:00:00 2001 From: Yoshie Muranaka Date: Tue, 6 Oct 2020 09:24:14 -0700 Subject: Make copy of single file firmware upload Make a copy of single file firmware upload component and store in env directory. Update IBM router to use copied single file firmware components. Update IBM store module to use copied single file firmware store. Signed-off-by: Yoshie Muranaka Change-Id: I046ce6c69a02b90400058866295b84c5435f5a4b --- .../FirmwareSingleImage/FirmwareSingleImage.vue | 405 +++++++++++++++++++++ .../FirmwareSingleImageModalRebootBackup.vue | 33 ++ .../FirmwareSingleImageModalUpload.vue | 18 + src/env/components/FirmwareSingleImage/index.js | 2 + src/env/router/ibm.js | 234 +++++++++++- .../FirmwareSingleImageStore.js | 161 ++++++++ src/env/store/ibm.js | 6 +- 7 files changed, 844 insertions(+), 15 deletions(-) create mode 100644 src/env/components/FirmwareSingleImage/FirmwareSingleImage.vue create mode 100644 src/env/components/FirmwareSingleImage/FirmwareSingleImageModalRebootBackup.vue create mode 100644 src/env/components/FirmwareSingleImage/FirmwareSingleImageModalUpload.vue create mode 100644 src/env/components/FirmwareSingleImage/index.js create mode 100644 src/env/store/FirmwareSingleImage/FirmwareSingleImageStore.js (limited to 'src/env') diff --git a/src/env/components/FirmwareSingleImage/FirmwareSingleImage.vue b/src/env/components/FirmwareSingleImage/FirmwareSingleImage.vue new file mode 100644 index 00000000..f719631a --- /dev/null +++ b/src/env/components/FirmwareSingleImage/FirmwareSingleImage.vue @@ -0,0 +1,405 @@ + + + + + diff --git a/src/env/components/FirmwareSingleImage/FirmwareSingleImageModalRebootBackup.vue b/src/env/components/FirmwareSingleImage/FirmwareSingleImageModalRebootBackup.vue new file mode 100644 index 00000000..a8fb3ad5 --- /dev/null +++ b/src/env/components/FirmwareSingleImage/FirmwareSingleImageModalRebootBackup.vue @@ -0,0 +1,33 @@ + + + diff --git a/src/env/components/FirmwareSingleImage/FirmwareSingleImageModalUpload.vue b/src/env/components/FirmwareSingleImage/FirmwareSingleImageModalUpload.vue new file mode 100644 index 00000000..d092becd --- /dev/null +++ b/src/env/components/FirmwareSingleImage/FirmwareSingleImageModalUpload.vue @@ -0,0 +1,18 @@ + diff --git a/src/env/components/FirmwareSingleImage/index.js b/src/env/components/FirmwareSingleImage/index.js new file mode 100644 index 00000000..06f31f91 --- /dev/null +++ b/src/env/components/FirmwareSingleImage/index.js @@ -0,0 +1,2 @@ +import FirmwareSingleImage from './FirmwareSingleImage.vue'; +export default FirmwareSingleImage; diff --git a/src/env/router/ibm.js b/src/env/router/ibm.js index 213920db..bfba0f0e 100644 --- a/src/env/router/ibm.js +++ b/src/env/router/ibm.js @@ -1,15 +1,225 @@ -import { remove } from 'lodash'; -import routes from '@/router/routes'; +import AppLayout from '@/layouts/AppLayout.vue'; +import ChangePassword from '@/views/ChangePassword'; +import ConsoleLayout from '@/layouts/ConsoleLayout.vue'; +import DateTimeSettings from '@/views/Configuration/DateTimeSettings'; +import EventLogs from '@/views/Health/EventLogs'; +import HardwareStatus from '@/views/Health/HardwareStatus'; +import Ldap from '@/views/AccessControl/Ldap'; +import LocalUserManagement from '@/views/AccessControl/LocalUserManagement'; +import Login from '@/views/Login'; +import LoginLayout from '@/layouts/LoginLayout'; +import ManagePowerUsage from '@/views/Control/ManagePowerUsage'; +import NetworkSettings from '@/views/Configuration/NetworkSettings'; +import Overview from '@/views/Overview'; +import PageNotFound from '@/views/PageNotFound'; +import ProfileSettings from '@/views/ProfileSettings'; +import RebootBmc from '@/views/Control/RebootBmc'; +import Sensors from '@/views/Health/Sensors'; +import SerialOverLan from '@/views/Control/SerialOverLan'; +import SerialOverLanConsole from '@/views/Control/SerialOverLan/SerialOverLanConsole'; +import ServerLed from '@/views/Control/ServerLed'; +import ServerPowerOperations from '@/views/Control/ServerPowerOperations'; +import SslCertificates from '@/views/AccessControl/SslCertificates'; +import VirtualMedia from '@/views/Control/VirtualMedia'; +import i18n from '@/i18n'; -const customRoutes = routes.map(route => { - // Removes router definition that includes kvm - // in name property (main and console layouts) +// Custom components +import FirmwareSingleImage from '../components/FirmwareSingleImage'; - // TODO: will revisit this, removing the definition - // removes the route from the application but - // the component is still included in the final build - remove(route.children, ({ name }) => name.includes('kvm')); - return route; -}); +const routes = [ + { + path: '/login', + component: LoginLayout, + children: [ + { + path: '', + name: 'login', + component: Login, + meta: { + title: i18n.t('appPageTitle.login') + } + }, + { + path: '/change-password', + name: 'change-password', + component: ChangePassword, + meta: { + title: i18n.t('appPageTitle.changePassword'), + requiresAuth: true + } + } + ] + }, + { + path: '/console', + component: ConsoleLayout, + meta: { + requiresAuth: true + }, + children: [ + { + path: 'serial-over-lan-console', + name: 'serial-over-lan-console', + component: SerialOverLanConsole, + meta: { + title: i18n.t('appPageTitle.serialOverLan') + } + } + ] + }, + { + path: '/', + meta: { + requiresAuth: true + }, + component: AppLayout, + children: [ + { + path: '', + name: 'overview', + component: Overview, + meta: { + title: i18n.t('appPageTitle.overview') + } + }, + { + path: '/profile-settings', + name: 'profile-settings', + component: ProfileSettings, + meta: { + title: i18n.t('appPageTitle.profileSettings') + } + }, + { + path: '/health/event-logs', + name: 'event-logs', + component: EventLogs, + meta: { + title: i18n.t('appPageTitle.eventLogs') + } + }, + { + path: '/health/hardware-status', + name: 'hardware-status', + component: HardwareStatus, + meta: { + title: i18n.t('appPageTitle.hardwareStatus') + } + }, + { + path: '/health/sensors', + name: 'sensors', + component: Sensors, + meta: { + title: i18n.t('appPageTitle.sensors') + } + }, + { + path: '/access-control/ldap', + name: 'ldap', + component: Ldap, + meta: { + title: i18n.t('appPageTitle.ldap') + } + }, + { + path: '/access-control/local-user-management', + name: 'local-users', + component: LocalUserManagement, + meta: { + title: i18n.t('appPageTitle.localUserManagement') + } + }, + { + path: '/access-control/ssl-certificates', + name: 'ssl-certificates', + component: SslCertificates, + meta: { + title: i18n.t('appPageTitle.sslCertificates') + } + }, + { + path: '/configuration/date-time-settings', + name: 'date-time-settings', + component: DateTimeSettings, + meta: { + title: i18n.t('appPageTitle.dateTimeSettings') + } + }, + { + path: '/configuration/firmware', + name: 'firmware', + component: FirmwareSingleImage, + meta: { + title: i18n.t('appPageTitle.firmware') + } + }, + { + path: '/control/manage-power-usage', + name: 'manage-power-usage', + component: ManagePowerUsage, + meta: { + title: i18n.t('appPageTitle.managePowerUsage') + } + }, + { + path: '/configuration/network-settings', + name: 'network-settings', + component: NetworkSettings, + meta: { + title: i18n.t('appPageTitle.networkSettings') + } + }, + { + path: '/control/reboot-bmc', + name: 'reboot-bmc', + component: RebootBmc, + meta: { + title: i18n.t('appPageTitle.rebootBmc') + } + }, + { + path: '/control/server-led', + name: 'server-led', + component: ServerLed, + meta: { + title: i18n.t('appPageTitle.serverLed') + } + }, + { + path: '/control/serial-over-lan', + name: 'serial-over-lan', + component: SerialOverLan, + meta: { + title: i18n.t('appPageTitle.serialOverLan') + } + }, + { + path: '/control/server-power-operations', + name: 'server-power-operations', + component: ServerPowerOperations, + meta: { + title: i18n.t('appPageTitle.serverPowerOperations') + } + }, + { + path: '/control/virtual-media', + name: 'virtual-media', + component: VirtualMedia, + meta: { + title: i18n.t('appPageTitle.virtualMedia') + } + }, + { + path: '*', + name: 'page-not-found', + component: PageNotFound, + meta: { + title: i18n.t('appPageTitle.pageNotFound') + } + } + ] + } +]; -export default customRoutes; +export default routes; diff --git a/src/env/store/FirmwareSingleImage/FirmwareSingleImageStore.js b/src/env/store/FirmwareSingleImage/FirmwareSingleImageStore.js new file mode 100644 index 00000000..d00c5f71 --- /dev/null +++ b/src/env/store/FirmwareSingleImage/FirmwareSingleImageStore.js @@ -0,0 +1,161 @@ +import api from '@/store/api'; +import i18n from '@/i18n'; + +const FirmwareSingleImageStore = { + namespaced: true, + state: { + activeFirmware: { + version: '--', + id: null, + location: null + }, + backupFirmware: { + version: '--', + id: null, + location: null, + status: '--' + }, + applyTime: null + }, + getters: { + systemFirmwareVersion: state => state.activeFirmware.version, + backupFirmwareVersion: state => state.backupFirmware.version, + backupFirmwareStatus: state => state.backupFirmware.status, + isRebootFromBackupAvailable: state => + state.backupFirmware.id ? true : false + }, + mutations: { + setActiveFirmware: (state, { version, id, location }) => { + state.activeFirmware.version = version; + state.activeFirmware.id = id; + state.activeFirmware.location = location; + }, + setBackupFirmware: (state, { version, id, location, status }) => { + state.backupFirmware.version = version; + state.backupFirmware.id = id; + state.backupFirmware.location = location; + state.backupFirmware.status = status; + }, + setApplyTime: (state, applyTime) => (state.applyTime = applyTime) + }, + actions: { + async getSystemFirwareVersion({ commit }) { + return await api + .get('/redfish/v1/Managers/bmc') + .then(({ data: { Links } }) => { + const currentLocation = Links.ActiveSoftwareImage['@odata.id']; + // Check SoftwareImages list for not ActiveSoftwareImage id + const backupLocation = Links.SoftwareImages.map( + item => item['@odata.id'] + ).find(location => { + const id = location.split('/').pop(); + const currentId = currentLocation.split('/').pop(); + return id !== currentId; + }); + return { currentLocation, backupLocation }; + }) + .then(async ({ currentLocation, backupLocation }) => { + const currentData = await api.get(currentLocation); + let backupData = {}; + + if (backupLocation) { + backupData = await api.get(backupLocation); + } + + commit('setActiveFirmware', { + version: currentData?.data?.Version, + id: currentData?.data?.Id, + location: currentData?.data?.['@odata.id'] + }); + commit('setBackupFirmware', { + version: backupData.data?.Version, + id: backupData.data?.Id, + location: backupData.data?.['@odata.id'], + status: backupData.data?.Status?.State + }); + }) + .catch(error => console.log(error)); + }, + getUpdateServiceApplyTime({ commit }) { + api + .get('/redfish/v1/UpdateService') + .then(({ data }) => { + const applyTime = + data.HttpPushUriOptions.HttpPushUriApplyTime.ApplyTime; + commit('setApplyTime', applyTime); + }) + .catch(error => console.log(error)); + }, + setApplyTimeImmediate({ commit }) { + const data = { + HttpPushUriOptions: { + HttpPushUriApplyTime: { + ApplyTime: 'Immediate' + } + } + }; + return api + .patch('/redfish/v1/UpdateService', data) + .then(() => commit('setApplyTime', 'Immediate')) + .catch(error => console.log(error)); + }, + async uploadFirmware({ state, dispatch }, image) { + if (state.applyTime !== 'Immediate') { + // ApplyTime must be set to Immediate before making + // request to update firmware + await dispatch('setApplyTimeImmediate'); + } + return await api + .post('/redfish/v1/UpdateService', image, { + headers: { 'Content-Type': 'application/octet-stream' } + }) + .then(() => dispatch('getSystemFirwareVersion')) + .then(() => i18n.t('pageFirmware.toast.successUploadMessage')) + .catch(error => { + console.log(error); + throw new Error(i18n.t('pageFirmware.toast.errorUploadAndReboot')); + }); + }, + async uploadFirmwareTFTP({ state, dispatch }, { address, filename }) { + const data = { + TransferProtocol: 'TFTP', + ImageURI: `${address}/${filename}` + }; + if (state.applyTime !== 'Immediate') { + // ApplyTime must be set to Immediate before making + // request to update firmware + await dispatch('setApplyTimeImmediate'); + } + return await api + .post( + '/redfish/v1/UpdateService/Actions/UpdateService.SimpleUpdate', + data + ) + .then(() => dispatch('getSystemFirwareVersion')) + .then(() => i18n.t('pageFirmware.toast.successUploadMessage')) + .catch(error => { + console.log(error); + throw new Error(i18n.t('pageFirmware.toast.errorUploadAndReboot')); + }); + }, + async switchFirmwareAndReboot({ state }) { + const backupLoaction = state.backupFirmware.location; + const data = { + Links: { + ActiveSoftwareImage: { + '@odata.id': backupLoaction + } + } + }; + return await api + .patch('/redfish/v1/Managers/bmc', data) + .then(() => i18n.t('pageFirmware.toast.successRebootFromBackup')) + .catch(error => { + console.log(error); + throw new Error(i18n.t('pageFirmware.toast.errorRebootFromBackup')); + }); + } + } +}; + +export default FirmwareSingleImageStore; diff --git a/src/env/store/ibm.js b/src/env/store/ibm.js index 70c9b98a..12fd0865 100644 --- a/src/env/store/ibm.js +++ b/src/env/store/ibm.js @@ -1,7 +1,7 @@ import store from '@/store'; +import FirmwareSingleImageStore from './FirmwareSingleImage/FirmwareSingleImageStore'; -// Use store.registerModule() to register env specific -// store modules -// https://vuex.vuejs.org/api/#registermodule +store.unregisterModule('firmware'); +store.registerModule('firmwareSingleImage', FirmwareSingleImageStore); export default store; -- cgit v1.2.3