From be6858c06bfbd1e06935ad01b743c1043f74488a Mon Sep 17 00:00:00 2001 From: Sukanya Pandey Date: Wed, 16 Dec 2020 20:08:01 +0530 Subject: Add power restore policy page - This page will show how the system boots once power is restored after a power disturbance. - API used to fetch the JSON: /redfish/v1/JsonSchemas/ComputerSystem/ComputerSystem.json - API used to fetch the current policy and to save updated policy: /redfish/v1/Systems/system/ Signed-off-by: Sukanya Pandey Change-Id: I203bd3c5d26071b882cce6b9950cdb3fb1deb212 --- src/components/AppNavigation/AppNavigationMixin.js | 5 ++ src/env/components/AppNavigation/ibm.js | 5 ++ src/env/router/ibm.js | 9 +++ src/locales/en-US.json | 16 +++++ src/router/routes.js | 9 +++ src/store/index.js | 2 + src/store/modules/Control/PowerPolicyStore.js | 72 +++++++++++++++++++ .../PowerRestorePolicy/PowerRestorePolicy.vue | 80 ++++++++++++++++++++++ src/views/Control/PowerRestorePolicy/index.js | 2 + .../unit/__snapshots__/AppNavigation.spec.js.snap | 18 +++++ 10 files changed, 218 insertions(+) create mode 100644 src/store/modules/Control/PowerPolicyStore.js create mode 100644 src/views/Control/PowerRestorePolicy/PowerRestorePolicy.vue create mode 100644 src/views/Control/PowerRestorePolicy/index.js diff --git a/src/components/AppNavigation/AppNavigationMixin.js b/src/components/AppNavigation/AppNavigationMixin.js index 7fe63a0a..a83b6c7f 100644 --- a/src/components/AppNavigation/AppNavigationMixin.js +++ b/src/components/AppNavigation/AppNavigationMixin.js @@ -60,6 +60,11 @@ const AppNavigationMixin = { label: this.$t('appNavigation.managePowerUsage'), route: '/control/manage-power-usage', }, + { + id: 'power-restore-policy', + label: this.$t('appNavigation.powerRestorePolicy'), + route: '/control/power-restore-policy', + }, { id: 'reboot-bmc', label: this.$t('appNavigation.rebootBmc'), diff --git a/src/env/components/AppNavigation/ibm.js b/src/env/components/AppNavigation/ibm.js index 4fd20965..dadb65dd 100644 --- a/src/env/components/AppNavigation/ibm.js +++ b/src/env/components/AppNavigation/ibm.js @@ -60,6 +60,11 @@ const AppNavigationMixin = { label: this.$t('appNavigation.managePowerUsage'), route: '/control/manage-power-usage', }, + { + id: 'power-restore-policy', + label: this.$t('appNavigation.powerRestorePolicy'), + route: '/control/power-restore-policy', + }, { id: 'reboot-bmc', label: this.$t('appNavigation.rebootBmc'), diff --git a/src/env/router/ibm.js b/src/env/router/ibm.js index e4940478..969146cb 100644 --- a/src/env/router/ibm.js +++ b/src/env/router/ibm.js @@ -13,6 +13,7 @@ import ManagePowerUsage from '@/views/Control/ManagePowerUsage'; import NetworkSettings from '@/views/Configuration/NetworkSettings'; import Overview from '@/views/Overview'; import PageNotFound from '@/views/PageNotFound'; +import PowerRestorePolicy from '@/views/Control/PowerRestorePolicy'; import ProfileSettings from '@/views/ProfileSettings'; import RebootBmc from '@/views/Control/RebootBmc'; import SecuritySettings from '@/views/Configuration/SecuritySettings'; @@ -180,6 +181,14 @@ const routes = [ title: i18n.t('appPageTitle.managePowerUsage'), }, }, + { + path: '/control/power-restore-policy', + name: 'power-restore-policy', + component: PowerRestorePolicy, + meta: { + title: i18n.t('appPageTitle.powerRestorePolicy'), + }, + }, { path: '/configuration/network-settings', name: 'network-settings', diff --git a/src/locales/en-US.json b/src/locales/en-US.json index 1f68d5c7..ed2495c5 100644 --- a/src/locales/en-US.json +++ b/src/locales/en-US.json @@ -111,6 +111,7 @@ "networkSettings": "@:appPageTitle.networkSettings", "overview": "@:appPageTitle.overview", "primaryNavigation": "Primary navigation", + "powerRestorePolicy": "@:appPageTitle.powerRestorePolicy", "rebootBmc": "@:appPageTitle.rebootBmc", "securitySettings": "@:appPageTitle.securitySettings", "sensors": "@:appPageTitle.sensors", @@ -137,6 +138,7 @@ "networkSettings": "Network settings", "overview": "Overview", "pageNotFound": "Page not found", + "powerRestorePolicy": "Power restore policy", "profileSettings": "Profile settings", "rebootBmc": "Reboot BMC", "securitySettings": "Security settings", @@ -592,6 +594,20 @@ "pagePageNotFound": { "description": "The requested resource could not be found." }, + "pagePowerRestorePolicy": { + "currentPolicy": "Current Policy", + "description": "Configure power policy to determine how the system starts after a power disturbance.", + "powerPoliciesLabel": "Power restore policies", + "policies" :{ + "AlwaysOn": "Always on", + "AlwaysOff": "Always off", + "LastState": "Last state" + }, + "toast": { + "errorSaveSettings": "Error saving settings.", + "successSaveSettings": "Power restore policy updated successfully." + } + }, "pageRebootBmc": { "lastReboot": "Last BMC reboot", "rebootBmc": "Reboot BMC", diff --git a/src/router/routes.js b/src/router/routes.js index 9a9b7137..533f1859 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -16,6 +16,7 @@ import ManagePowerUsage from '@/views/Control/ManagePowerUsage'; import NetworkSettings from '@/views/Configuration/NetworkSettings'; import Overview from '@/views/Overview'; import PageNotFound from '@/views/PageNotFound'; +import PowerRestorePolicy from '@/views/Control/PowerRestorePolicy'; import ProfileSettings from '@/views/ProfileSettings'; import RebootBmc from '@/views/Control/RebootBmc'; import SecuritySettings from '@/views/Configuration/SecuritySettings'; @@ -196,6 +197,14 @@ const routes = [ title: i18n.t('appPageTitle.managePowerUsage'), }, }, + { + path: '/control/power-restore-policy', + name: 'power-restore-policy', + component: PowerRestorePolicy, + meta: { + title: i18n.t('appPageTitle.powerRestorePolicy'), + }, + }, { path: '/configuration/network-settings', name: 'network-settings', diff --git a/src/store/index.js b/src/store/index.js index 151eb68c..fd8b1fcf 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -11,6 +11,7 @@ import FirmwareStore from './modules/Configuration/FirmwareStore'; import BootSettingsStore from './modules/Control/BootSettingsStore'; import ControlStore from './modules/Control/ControlStore'; import PowerControlStore from './modules/Control/PowerControlStore'; +import PowerPolicyStore from './modules/Control/PowerPolicyStore'; import NetworkSettingStore from './modules/Configuration/NetworkSettingsStore'; import EventLogStore from './modules/Health/EventLogStore'; import SensorsStore from './modules/Health/SensorsStore'; @@ -45,6 +46,7 @@ export default new Vuex.Store({ hostBootSettings: BootSettingsStore, controls: ControlStore, powerControl: PowerControlStore, + powerPolicy: PowerPolicyStore, powerSupply: PowerSupplyStore, networkSettings: NetworkSettingStore, eventLog: EventLogStore, diff --git a/src/store/modules/Control/PowerPolicyStore.js b/src/store/modules/Control/PowerPolicyStore.js new file mode 100644 index 00000000..4e76cdfe --- /dev/null +++ b/src/store/modules/Control/PowerPolicyStore.js @@ -0,0 +1,72 @@ +import api from '@/store/api'; +import i18n from '@/i18n'; + +const PowerControlStore = { + namespaced: true, + state: { + powerRestoreCurrentPolicy: null, + powerRestorePolicies: [], + }, + getters: { + powerRestoreCurrentPolicy: (state) => state.powerRestoreCurrentPolicy, + powerRestorePolicies: (state) => state.powerRestorePolicies, + }, + mutations: { + setPowerRestoreCurrentPolicy: (state, powerRestoreCurrentPolicy) => + (state.powerRestoreCurrentPolicy = powerRestoreCurrentPolicy), + setPowerRestorePolicies: (state, powerRestorePolicies) => + (state.powerRestorePolicies = powerRestorePolicies), + }, + actions: { + async getPowerRestorePolicies({ commit }) { + return await api + .get('/redfish/v1/JsonSchemas/ComputerSystem/ComputerSystem.json') + .then( + ({ + data: { + definitions: { PowerRestorePolicyTypes = {} }, + }, + }) => { + let powerPoliciesData = PowerRestorePolicyTypes.enum.map( + (powerState) => { + let desc = `${i18n.t( + `pagePowerRestorePolicy.policies.${powerState}` + )} - ${PowerRestorePolicyTypes.enumDescriptions[powerState]}`; + return { + state: powerState, + desc, + }; + } + ); + commit('setPowerRestorePolicies', powerPoliciesData); + } + ); + }, + async getPowerRestoreCurrentPolicy({ commit }) { + api + .get('/redfish/v1/Systems/system') + .then(({ data: { PowerRestorePolicy } }) => { + commit('setPowerRestoreCurrentPolicy', PowerRestorePolicy); + }) + .catch((error) => console.log(error)); + }, + async setPowerRestorePolicy({ commit }, powerPolicy) { + const data = { PowerRestorePolicy: powerPolicy }; + + return await api + .patch('/redfish/v1/Systems/system', data) + .then(() => + commit('setPowerRestoreCurrentPolicy', data.PowerRestorePolicy) + ) + .then(() => i18n.t('pagePowerRestorePolicy.toast.successSaveSettings')) + .catch((error) => { + console.log(error); + throw new Error( + i18n.t('pagePowerRestorePolicy.toast.errorSaveSettings') + ); + }); + }, + }, +}; + +export default PowerControlStore; diff --git a/src/views/Control/PowerRestorePolicy/PowerRestorePolicy.vue b/src/views/Control/PowerRestorePolicy/PowerRestorePolicy.vue new file mode 100644 index 00000000..8589aed3 --- /dev/null +++ b/src/views/Control/PowerRestorePolicy/PowerRestorePolicy.vue @@ -0,0 +1,80 @@ + + + diff --git a/src/views/Control/PowerRestorePolicy/index.js b/src/views/Control/PowerRestorePolicy/index.js new file mode 100644 index 00000000..fab0d477 --- /dev/null +++ b/src/views/Control/PowerRestorePolicy/index.js @@ -0,0 +1,2 @@ +import PowerRestorePolicy from './PowerRestorePolicy.vue'; +export default PowerRestorePolicy; diff --git a/tests/unit/__snapshots__/AppNavigation.spec.js.snap b/tests/unit/__snapshots__/AppNavigation.spec.js.snap index e0ab2737..11db8068 100644 --- a/tests/unit/__snapshots__/AppNavigation.spec.js.snap +++ b/tests/unit/__snapshots__/AppNavigation.spec.js.snap @@ -233,6 +233,15 @@ exports[`AppNavigation.vue should render correctly 1`] = ` appNavigation.managePowerUsage + + + + appNavigation.powerRestorePolicy + + + + appNavigation.powerRestorePolicy +