IA update: Update control section to operations
This is the third update to the information architecture changes and
has the following changes:
- The control section has been updated to operations
- The server led page has been removed
- The firmware page is moved to operations section
Signed-off-by: Sandeepa Singh <sandeepa.singh@ibm.com>
Change-Id: I2e23da447890d7bee51892e1f782d5f2db6dded4
diff --git a/src/components/AppHeader/AppHeader.vue b/src/components/AppHeader/AppHeader.vue
index df6acbf..26f4a68 100644
--- a/src/components/AppHeader/AppHeader.vue
+++ b/src/components/AppHeader/AppHeader.vue
@@ -56,7 +56,7 @@
{{ $t('appHeader.health') }}
</b-nav-item>
<b-nav-item
- to="/control/server-power-operations"
+ to="/operations/server-power-operations"
data-test-id="appHeader-container-power"
>
<status-icon :status="serverStatusIcon" />
diff --git a/src/components/AppNavigation/AppNavigationMixin.js b/src/components/AppNavigation/AppNavigationMixin.js
index 10ca5f8..935bd7e 100644
--- a/src/components/AppNavigation/AppNavigationMixin.js
+++ b/src/components/AppNavigation/AppNavigationMixin.js
@@ -60,54 +60,54 @@
],
},
{
- id: 'control',
- label: this.$t('appNavigation.control'),
+ id: 'operations',
+ label: this.$t('appNavigation.operations'),
icon: 'iconControl',
children: [
{
id: 'factory-reset',
label: this.$t('appNavigation.factoryReset'),
- route: '/control/factory-reset',
+ route: '/operations/factory-reset',
},
{
id: 'kvm',
label: this.$t('appNavigation.kvm'),
- route: '/control/kvm',
+ route: '/operations/kvm',
+ },
+ {
+ id: 'firmware',
+ label: this.$t('appNavigation.firmware'),
+ route: '/operations/firmware',
},
{
id: 'manage-power-usage',
label: this.$t('appNavigation.managePowerUsage'),
- route: '/control/manage-power-usage',
+ route: '/operations/manage-power-usage',
},
{
id: 'power-restore-policy',
label: this.$t('appNavigation.powerRestorePolicy'),
- route: '/control/power-restore-policy',
+ route: '/operations/power-restore-policy',
},
{
id: 'reboot-bmc',
label: this.$t('appNavigation.rebootBmc'),
- route: '/control/reboot-bmc',
+ route: '/operations/reboot-bmc',
},
{
id: 'serial-over-lan',
label: this.$t('appNavigation.serialOverLan'),
- route: '/control/serial-over-lan',
- },
- {
- id: 'server-led',
- label: this.$t('appNavigation.serverLed'),
- route: '/control/server-led',
+ route: '/operations/serial-over-lan',
},
{
id: 'server-power-operations',
label: this.$t('appNavigation.serverPowerOperations'),
- route: '/control/server-power-operations',
+ route: '/operations/server-power-operations',
},
{
id: 'virtual-media',
label: this.$t('appNavigation.virtualMedia'),
- route: '/control/virtual-media',
+ route: '/operations/virtual-media',
},
],
},
@@ -122,11 +122,6 @@
route: '/configuration/date-time-settings',
},
{
- id: 'firmware',
- label: this.$t('appNavigation.firmware'),
- route: '/configuration/firmware',
- },
- {
id: 'network-settings',
label: this.$t('appNavigation.networkSettings'),
route: '/configuration/network-settings',
diff --git a/src/env/components/AppNavigation/ibm.js b/src/env/components/AppNavigation/ibm.js
index 0128d74..fa3891e 100644
--- a/src/env/components/AppNavigation/ibm.js
+++ b/src/env/components/AppNavigation/ibm.js
@@ -65,44 +65,44 @@
],
},
{
- id: 'control',
- label: this.$t('appNavigation.control'),
+ id: 'operations',
+ label: this.$t('appNavigation.operations'),
icon: 'iconControl',
children: [
{
id: 'factory-reset',
label: this.$t('appNavigation.factoryReset'),
- route: '/control/factory-reset',
+ route: '/operations/factory-reset',
+ },
+ {
+ id: 'firmware',
+ label: this.$t('appNavigation.firmware'),
+ route: '/operations/firmware',
},
{
id: 'manage-power-usage',
label: this.$t('appNavigation.managePowerUsage'),
- route: '/control/manage-power-usage',
+ route: '/operations/manage-power-usage',
},
{
id: 'power-restore-policy',
label: this.$t('appNavigation.powerRestorePolicy'),
- route: '/control/power-restore-policy',
+ route: '/operations/power-restore-policy',
},
{
id: 'reboot-bmc',
label: this.$t('appNavigation.rebootBmc'),
- route: '/control/reboot-bmc',
+ route: '/operations/reboot-bmc',
},
{
id: 'serial-over-lan',
label: this.$t('appNavigation.serialOverLan'),
- route: '/control/serial-over-lan',
- },
- {
- id: 'server-led',
- label: this.$t('appNavigation.serverLed'),
- route: '/control/server-led',
+ route: '/operations/serial-over-lan',
},
{
id: 'server-power-operations',
label: this.$t('appNavigation.serverPowerOperations'),
- route: '/control/server-power-operations',
+ route: '/operations/server-power-operations',
},
],
},
@@ -117,11 +117,6 @@
route: '/configuration/date-time-settings',
},
{
- id: 'firmware',
- label: this.$t('appNavigation.firmware'),
- route: '/configuration/firmware',
- },
- {
id: 'network-settings',
label: this.$t('appNavigation.networkSettings'),
route: '/configuration/network-settings',
diff --git a/src/env/components/AppNavigation/intel.js b/src/env/components/AppNavigation/intel.js
index 68557c1..2c4188c 100644
--- a/src/env/components/AppNavigation/intel.js
+++ b/src/env/components/AppNavigation/intel.js
@@ -55,44 +55,44 @@
],
},
{
- id: 'control',
- label: this.$t('appNavigation.control'),
+ id: 'operations',
+ label: this.$t('appNavigation.operations'),
icon: 'iconControl',
children: [
{
id: 'kvm',
label: this.$t('appNavigation.kvm'),
- route: '/control/kvm',
+ route: '/operations/kvm',
+ },
+ {
+ id: 'firmware',
+ label: this.$t('appNavigation.firmware'),
+ route: '/operations/firmware',
},
{
id: 'manage-power-usage',
label: this.$t('appNavigation.managePowerUsage'),
- route: '/control/manage-power-usage',
+ route: '/operations/manage-power-usage',
},
{
id: 'reboot-bmc',
label: this.$t('appNavigation.rebootBmc'),
- route: '/control/reboot-bmc',
+ route: '/operations/reboot-bmc',
},
{
id: 'serial-over-lan',
label: this.$t('appNavigation.serialOverLan'),
- route: '/control/serial-over-lan',
- },
- {
- id: 'server-led',
- label: this.$t('appNavigation.serverLed'),
- route: '/control/server-led',
+ route: '/operations/serial-over-lan',
},
{
id: 'server-power-operations',
label: this.$t('appNavigation.serverPowerOperations'),
- route: '/control/server-power-operations',
+ route: '/operations/server-power-operations',
},
{
id: 'virtual-media',
label: this.$t('appNavigation.virtualMedia'),
- route: '/control/virtual-media',
+ route: '/operations/virtual-media',
},
],
},
@@ -107,11 +107,6 @@
route: '/configuration/date-time-settings',
},
{
- id: 'firmware',
- label: this.$t('appNavigation.firmware'),
- route: '/configuration/firmware',
- },
- {
id: 'network-settings',
label: this.$t('appNavigation.networkSettings'),
route: '/configuration/network-settings',
diff --git a/src/env/router/ibm.js b/src/env/router/ibm.js
index 208cd97..b0129ea 100644
--- a/src/env/router/ibm.js
+++ b/src/env/router/ibm.js
@@ -4,27 +4,26 @@
import ConsoleLayout from '@/layouts/ConsoleLayout.vue';
import DateTimeSettings from '@/views/Configuration/DateTimeSettings';
import EventLogs from '@/views/Logs/EventLogs';
-import FactoryReset from '@/views/Control/FactoryReset';
-import Firmware from '@/views/Configuration/Firmware';
+import FactoryReset from '@/views/Operations/FactoryReset';
+import Firmware from '@/views/Operations/Firmware';
import Inventory from '@/views/HardwareStatus/Inventory';
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 ManagePowerUsage from '@/views/Operations/ManagePowerUsage';
import NetworkSettings from '@/views/Configuration/NetworkSettings';
import Overview from '@/views/Overview';
import PageNotFound from '@/views/PageNotFound';
import PostCodeLogs from '@/views/Logs/PostCodeLogs';
-import PowerRestorePolicy from '@/views/Control/PowerRestorePolicy';
+import PowerRestorePolicy from '@/views/Operations/PowerRestorePolicy';
import ProfileSettings from '@/views/ProfileSettings';
-import RebootBmc from '@/views/Control/RebootBmc';
+import RebootBmc from '@/views/Operations/RebootBmc';
import SecuritySettings from '@/views/Configuration/SecuritySettings';
import Sensors from '@/views/HardwareStatus/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 SerialOverLan from '@/views/Operations/SerialOverLan';
+import SerialOverLanConsole from '@/views/Operations/SerialOverLan/SerialOverLanConsole';
+import ServerPowerOperations from '@/views/Operations/ServerPowerOperations';
import SslCertificates from '@/views/AccessControl/SslCertificates';
import i18n from '@/i18n';
@@ -176,7 +175,7 @@
},
},
{
- path: '/configuration/firmware',
+ path: '/operations/firmware',
name: 'firmware',
component: Firmware,
meta: {
@@ -184,7 +183,7 @@
},
},
{
- path: '/control/manage-power-usage',
+ path: '/operations/manage-power-usage',
name: 'manage-power-usage',
component: ManagePowerUsage,
meta: {
@@ -192,7 +191,7 @@
},
},
{
- path: '/control/power-restore-policy',
+ path: '/operations/power-restore-policy',
name: 'power-restore-policy',
component: PowerRestorePolicy,
meta: {
@@ -216,7 +215,7 @@
},
},
{
- path: '/control/factory-reset',
+ path: '/operations/factory-reset',
name: 'factory-reset',
component: FactoryReset,
meta: {
@@ -224,7 +223,7 @@
},
},
{
- path: '/control/reboot-bmc',
+ path: '/operations/reboot-bmc',
name: 'reboot-bmc',
component: RebootBmc,
meta: {
@@ -232,15 +231,7 @@
},
},
{
- path: '/control/server-led',
- name: 'server-led',
- component: ServerLed,
- meta: {
- title: i18n.t('appPageTitle.serverLed'),
- },
- },
- {
- path: '/control/serial-over-lan',
+ path: '/operations/serial-over-lan',
name: 'serial-over-lan',
component: SerialOverLan,
meta: {
@@ -248,7 +239,7 @@
},
},
{
- path: '/control/server-power-operations',
+ path: '/operations/server-power-operations',
name: 'server-power-operations',
component: ServerPowerOperations,
meta: {
diff --git a/src/env/router/intel.js b/src/env/router/intel.js
index 53ae5d4..04fc0ef 100644
--- a/src/env/router/intel.js
+++ b/src/env/router/intel.js
@@ -4,27 +4,26 @@
import ConsoleLayout from '@/layouts/ConsoleLayout.vue';
import DateTimeSettings from '@/views/Configuration/DateTimeSettings';
import EventLogs from '@/views/Logs/EventLogs';
-import Firmware from '@/views/Configuration/Firmware';
+import Firmware from '@/views/Operations/Firmware';
import Inventory from '@/views/HardwareStatus/Inventory';
-import Kvm from '@/views/Control/Kvm';
-import KvmConsole from '@/views/Control/Kvm/KvmConsole';
+import Kvm from '@/views/Operations/Kvm';
+import KvmConsole from '@/views/Operations/Kvm/KvmConsole';
import LocalUserManagement from '@/views/AccessControl/LocalUserManagement';
import Login from '@/views/Login';
import LoginLayout from '@/layouts/LoginLayout';
-import ManagePowerUsage from '@/views/Control/ManagePowerUsage';
+import ManagePowerUsage from '@/views/Operations/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 RebootBmc from '@/views/Operations/RebootBmc';
import SecuritySettings from '@/views/Configuration/SecuritySettings';
import Sensors from '@/views/HardwareStatus/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 SerialOverLan from '@/views/Operations/SerialOverLan';
+import SerialOverLanConsole from '@/views/Operations/SerialOverLan/SerialOverLanConsole';
+import ServerPowerOperations from '@/views/Operations/ServerPowerOperations';
import SslCertificates from '@/views/AccessControl/SslCertificates';
-import VirtualMedia from '@/views/Control/VirtualMedia';
+import VirtualMedia from '@/views/Operations/VirtualMedia';
import i18n from '@/i18n';
const routes = [
@@ -156,15 +155,7 @@
},
},
{
- path: '/configuration/firmware',
- name: 'firmware',
- component: Firmware,
- meta: {
- title: i18n.t('appPageTitle.firmware'),
- },
- },
- {
- path: '/control/kvm',
+ path: '/operations/kvm',
name: 'kvm',
component: Kvm,
meta: {
@@ -172,7 +163,15 @@
},
},
{
- path: '/control/manage-power-usage',
+ path: '/operations/firmware',
+ name: 'firmware',
+ component: Firmware,
+ meta: {
+ title: i18n.t('appPageTitle.firmware'),
+ },
+ },
+ {
+ path: '/operations/manage-power-usage',
name: 'manage-power-usage',
component: ManagePowerUsage,
meta: {
@@ -196,7 +195,7 @@
},
},
{
- path: '/control/reboot-bmc',
+ path: '/operations/reboot-bmc',
name: 'reboot-bmc',
component: RebootBmc,
meta: {
@@ -204,15 +203,7 @@
},
},
{
- path: '/control/server-led',
- name: 'server-led',
- component: ServerLed,
- meta: {
- title: i18n.t('appPageTitle.serverLed'),
- },
- },
- {
- path: '/control/serial-over-lan',
+ path: '/operations/serial-over-lan',
name: 'serial-over-lan',
component: SerialOverLan,
meta: {
@@ -220,7 +211,7 @@
},
},
{
- path: '/control/server-power-operations',
+ path: '/operations/server-power-operations',
name: 'server-power-operations',
component: ServerPowerOperations,
meta: {
@@ -228,7 +219,7 @@
},
},
{
- path: '/control/virtual-media',
+ path: '/operations/virtual-media',
name: 'virtual-media',
component: VirtualMedia,
meta: {
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index ee1f614..856edb8 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -101,7 +101,7 @@
"accessControl": "Access control",
"clientSessions": "@:appPageTitle.clientSessions",
"configuration": "Configuration",
- "control": "Control",
+ "operations": "Operations",
"dateTimeSettings": "@:appPageTitle.dateTimeSettings",
"dumps": "@:appPageTitle.dumps",
"eventLogs": "@:appPageTitle.eventLogs",
@@ -123,7 +123,6 @@
"securitySettings": "@:appPageTitle.securitySettings",
"sensors": "@:appPageTitle.sensors",
"serialOverLan": "SOL console",
- "serverLed": "@:appPageTitle.serverLed",
"serverPowerOperations": "@:appPageTitle.serverPowerOperations",
"snmpSettings": "SNMP settings",
"sslCertificates": "@:appPageTitle.sslCertificates",
@@ -153,7 +152,6 @@
"securitySettings": "Security settings",
"sensors": "Sensors",
"serialOverLan": "Serial over LAN (SOL) console",
- "serverLed": "Server LED",
"serverPowerOperations": "Server power operations",
"sslCertificates": "SSL certificates",
"virtualMedia": "Virtual media"
@@ -734,16 +732,6 @@
"status": "Status",
"subTitle": "SOL console redirects the server's serial port output to this window."
},
- "pageServerLed": {
- "serverLedSubTitle": "Server indicator LED",
- "serverLedTitle": "LED light control",
- "toast": {
- "errorServerLedOff": "Error turning LED off.",
- "errorServerLedOn": "Error turning LED on.",
- "successServerLedOff": "Server LED successfully turned off.",
- "successServerLedOn": "Server LED successfully turned on."
- }
- },
"pageServerPowerOperations": {
"currentStatus": "Current status",
"serverBootSettings": "Boot settings",
diff --git a/src/router/routes.js b/src/router/routes.js
index 3cf10c5..f8461f3 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -3,32 +3,31 @@
import ConsoleLayout from '@/layouts/ConsoleLayout.vue';
import DateTimeSettings from '@/views/Configuration/DateTimeSettings';
import EventLogs from '@/views/Logs/EventLogs';
-import FactoryReset from '@/views/Control/FactoryReset';
-import Firmware from '@/views/Configuration/Firmware';
+import FactoryReset from '@/views/Operations/FactoryReset';
+import Firmware from '@/views/Operations/Firmware';
import Inventory from '@/views/HardwareStatus/Inventory';
-import Kvm from '@/views/Control/Kvm';
-import KvmConsole from '@/views/Control/Kvm/KvmConsole';
+import Kvm from '@/views/Operations/Kvm';
+import KvmConsole from '@/views/Operations/Kvm/KvmConsole';
import ClientSessions from '../views/AccessControl/ClientSessions';
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 ManagePowerUsage from '@/views/Operations/ManagePowerUsage';
import NetworkSettings from '@/views/Configuration/NetworkSettings';
import Overview from '@/views/Overview';
import PageNotFound from '@/views/PageNotFound';
import PostCodeLogs from '@/views/Logs/PostCodeLogs';
-import PowerRestorePolicy from '@/views/Control/PowerRestorePolicy';
+import PowerRestorePolicy from '@/views/Operations/PowerRestorePolicy';
import ProfileSettings from '@/views/ProfileSettings';
-import RebootBmc from '@/views/Control/RebootBmc';
+import RebootBmc from '@/views/Operations/RebootBmc';
import SecuritySettings from '@/views/Configuration/SecuritySettings';
import Sensors from '@/views/HardwareStatus/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 SerialOverLan from '@/views/Operations/SerialOverLan';
+import SerialOverLanConsole from '@/views/Operations/SerialOverLan/SerialOverLanConsole';
+import ServerPowerOperations from '@/views/Operations/ServerPowerOperations';
import SslCertificates from '@/views/AccessControl/SslCertificates';
-import VirtualMedia from '@/views/Control/VirtualMedia';
+import VirtualMedia from '@/views/Operations/VirtualMedia';
import i18n from '@/i18n';
const routes = [
@@ -176,14 +175,6 @@
},
},
{
- path: '/configuration/firmware',
- name: 'firmware',
- component: Firmware,
- meta: {
- title: i18n.t('appPageTitle.firmware'),
- },
- },
- {
path: '/configuration/security-settings',
name: 'security-settings',
component: SecuritySettings,
@@ -192,7 +183,7 @@
},
},
{
- path: '/control/factory-reset',
+ path: '/operations/factory-reset',
name: 'factory-reset',
component: FactoryReset,
meta: {
@@ -200,7 +191,7 @@
},
},
{
- path: '/control/kvm',
+ path: '/operations/kvm',
name: 'kvm',
component: Kvm,
meta: {
@@ -208,7 +199,15 @@
},
},
{
- path: '/control/manage-power-usage',
+ path: '/operations/firmware',
+ name: 'firmware',
+ component: Firmware,
+ meta: {
+ title: i18n.t('appPageTitle.firmware'),
+ },
+ },
+ {
+ path: '/operations/manage-power-usage',
name: 'manage-power-usage',
component: ManagePowerUsage,
meta: {
@@ -216,7 +215,7 @@
},
},
{
- path: '/control/power-restore-policy',
+ path: '/operations/power-restore-policy',
name: 'power-restore-policy',
component: PowerRestorePolicy,
meta: {
@@ -232,7 +231,7 @@
},
},
{
- path: '/control/reboot-bmc',
+ path: '/operations/reboot-bmc',
name: 'reboot-bmc',
component: RebootBmc,
meta: {
@@ -240,15 +239,7 @@
},
},
{
- path: '/control/server-led',
- name: 'server-led',
- component: ServerLed,
- meta: {
- title: i18n.t('appPageTitle.serverLed'),
- },
- },
- {
- path: '/control/serial-over-lan',
+ path: '/operations/serial-over-lan',
name: 'serial-over-lan',
component: SerialOverLan,
meta: {
@@ -256,7 +247,7 @@
},
},
{
- path: '/control/server-power-operations',
+ path: '/operations/server-power-operations',
name: 'server-power-operations',
component: ServerPowerOperations,
meta: {
@@ -264,7 +255,7 @@
},
},
{
- path: '/control/virtual-media',
+ path: '/operations/virtual-media',
name: 'virtual-media',
component: VirtualMedia,
meta: {
diff --git a/src/store/index.js b/src/store/index.js
index 3ea4c5a..fcfac59 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -7,11 +7,11 @@
import LdapStore from './modules/AccessControl/LdapStore';
import LocalUserManagementStore from './modules/AccessControl/LocalUserMangementStore';
import SslCertificatesStore from './modules/AccessControl/SslCertificatesStore';
-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 FirmwareStore from './modules/Operations/FirmwareStore';
+import BootSettingsStore from './modules/Operations/BootSettingsStore';
+import ControlStore from './modules/Operations/ControlStore';
+import PowerControlStore from './modules/Operations/PowerControlStore';
+import PowerPolicyStore from './modules/Operations/PowerPolicyStore';
import NetworkSettingStore from './modules/Configuration/NetworkSettingsStore';
import EventLogStore from './modules/Logs/EventLogStore';
import SensorsStore from './modules/HardwareStatus/SensorsStore';
@@ -25,11 +25,11 @@
import ProcessorStore from './modules/HardwareStatus/ProcessorStore';
import PostCodeLogsStore from './modules/Logs/PostCodeLogsStore';
import SecuritySettingsStore from './modules/Configuration/SecuritySettingsStore';
-import FactoryResetStore from './modules/Control/FactoryResetStore';
+import FactoryResetStore from './modules/Operations/FactoryResetStore';
import WebSocketPlugin from './plugins/WebSocketPlugin';
import DateTimeStore from './modules/Configuration/DateTimeSettingsStore';
-import VirtualMediaStore from './modules/Control/VirtualMediaStore';
+import VirtualMediaStore from './modules/Operations/VirtualMediaStore';
Vue.use(Vuex);
diff --git a/src/store/modules/HardwareStatus/ServerLedStore.js b/src/store/modules/HardwareStatus/ServerLedStore.js
index a8903e2..028a6f7 100644
--- a/src/store/modules/HardwareStatus/ServerLedStore.js
+++ b/src/store/modules/HardwareStatus/ServerLedStore.js
@@ -32,20 +32,17 @@
.patch('/redfish/v1/Systems/system', {
LocationIndicatorActive: payload,
})
- .then(() => {
- if (payload) {
- return i18n.t('pageServerLed.toast.successServerLedOn');
- } else {
- return i18n.t('pageServerLed.toast.successServerLedOff');
- }
- })
.catch((error) => {
console.log(error);
commit('setIndicatorLedActiveState', !payload);
if (payload) {
- throw new Error(i18n.t('pageServerLed.toast.errorServerLedOn'));
+ throw new Error(
+ i18n.t('pageInventory.toast.errorEnableIdentifyLed')
+ );
} else {
- throw new Error(i18n.t('pageServerLed.toast.errorServerLedOff'));
+ throw new Error(
+ i18n.t('pageInventory.toast.errorDisableIdentifyLed')
+ );
}
});
},
diff --git a/src/store/modules/Control/BootSettingsStore.js b/src/store/modules/Operations/BootSettingsStore.js
similarity index 100%
rename from src/store/modules/Control/BootSettingsStore.js
rename to src/store/modules/Operations/BootSettingsStore.js
diff --git a/src/store/modules/Control/ControlStore.js b/src/store/modules/Operations/ControlStore.js
similarity index 100%
rename from src/store/modules/Control/ControlStore.js
rename to src/store/modules/Operations/ControlStore.js
diff --git a/src/store/modules/Control/FactoryResetStore.js b/src/store/modules/Operations/FactoryResetStore.js
similarity index 100%
rename from src/store/modules/Control/FactoryResetStore.js
rename to src/store/modules/Operations/FactoryResetStore.js
diff --git a/src/store/modules/Configuration/FirmwareStore.js b/src/store/modules/Operations/FirmwareStore.js
similarity index 100%
rename from src/store/modules/Configuration/FirmwareStore.js
rename to src/store/modules/Operations/FirmwareStore.js
diff --git a/src/store/modules/Control/PowerControlStore.js b/src/store/modules/Operations/PowerControlStore.js
similarity index 100%
rename from src/store/modules/Control/PowerControlStore.js
rename to src/store/modules/Operations/PowerControlStore.js
diff --git a/src/store/modules/Control/PowerPolicyStore.js b/src/store/modules/Operations/PowerPolicyStore.js
similarity index 100%
rename from src/store/modules/Control/PowerPolicyStore.js
rename to src/store/modules/Operations/PowerPolicyStore.js
diff --git a/src/store/modules/Control/VirtualMediaStore.js b/src/store/modules/Operations/VirtualMediaStore.js
similarity index 100%
rename from src/store/modules/Control/VirtualMediaStore.js
rename to src/store/modules/Operations/VirtualMediaStore.js
diff --git a/src/views/Control/ServerLed/ServerLed.vue b/src/views/Control/ServerLed/ServerLed.vue
deleted file mode 100644
index 72726ba..0000000
--- a/src/views/Control/ServerLed/ServerLed.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
- <b-container fluid="xl">
- <page-title />
- <b-row>
- <b-col md="12">
- <page-section :section-title="$t('pageServerLed.serverLedTitle')">
- <b-form-group :label="$t('pageServerLed.serverLedSubTitle')">
- <b-form-checkbox
- v-model="indicatorLedActiveState"
- data-test-id="serverLed-checkbox-switchIndicatorLed"
- name="check-button"
- switch
- @change="changeLedValue"
- >
- <span v-if="indicatorLedActiveState">
- {{ $t('global.status.on') }}
- </span>
- <span v-else>
- {{ $t('global.status.off') }}
- </span>
- </b-form-checkbox>
- </b-form-group>
- </page-section>
- </b-col>
- </b-row>
- </b-container>
-</template>
-
-<script>
-import PageTitle from '@/components/Global/PageTitle';
-import PageSection from '@/components/Global/PageSection';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
-
-export default {
- name: 'ServerLed',
- components: { PageTitle, PageSection },
- mixins: [LoadingBarMixin, BVToastMixin],
- beforeRouteLeave(to, from, next) {
- this.hideLoader();
- next();
- },
- computed: {
- indicatorLedActiveState: {
- get() {
- return this.$store.getters['serverLed/getIndicatorLedActiveState'];
- },
- set(newValue) {
- return newValue;
- },
- },
- },
- created() {
- this.startLoader();
- this.$store
- .dispatch('serverLed/getIndicatorLedActiveState')
- .finally(() => this.endLoader());
- },
- methods: {
- changeLedValue(indicatorLedActiveState) {
- this.$store
- .dispatch(
- 'serverLed/saveIndicatorLedActiveState',
- indicatorLedActiveState
- )
- .then((message) => this.successToast(message))
- .catch(({ message }) => this.errorToast(message));
- },
- },
-};
-</script>
diff --git a/src/views/Control/ServerLed/index.js b/src/views/Control/ServerLed/index.js
deleted file mode 100644
index 1926dae..0000000
--- a/src/views/Control/ServerLed/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import ServerLed from './ServerLed.vue';
-export default ServerLed;
diff --git a/src/views/Control/FactoryReset/FactoryReset.vue b/src/views/Operations/FactoryReset/FactoryReset.vue
similarity index 100%
rename from src/views/Control/FactoryReset/FactoryReset.vue
rename to src/views/Operations/FactoryReset/FactoryReset.vue
diff --git a/src/views/Control/FactoryReset/FactoryResetModal.vue b/src/views/Operations/FactoryReset/FactoryResetModal.vue
similarity index 100%
rename from src/views/Control/FactoryReset/FactoryResetModal.vue
rename to src/views/Operations/FactoryReset/FactoryResetModal.vue
diff --git a/src/views/Control/FactoryReset/index.js b/src/views/Operations/FactoryReset/index.js
similarity index 100%
rename from src/views/Control/FactoryReset/index.js
rename to src/views/Operations/FactoryReset/index.js
diff --git a/src/views/Configuration/Firmware/Firmware.vue b/src/views/Operations/Firmware/Firmware.vue
similarity index 100%
rename from src/views/Configuration/Firmware/Firmware.vue
rename to src/views/Operations/Firmware/Firmware.vue
diff --git a/src/views/Configuration/Firmware/FirmwareAlertServerPower.vue b/src/views/Operations/Firmware/FirmwareAlertServerPower.vue
similarity index 100%
rename from src/views/Configuration/Firmware/FirmwareAlertServerPower.vue
rename to src/views/Operations/Firmware/FirmwareAlertServerPower.vue
diff --git a/src/views/Configuration/Firmware/FirmwareCardsBmc.vue b/src/views/Operations/Firmware/FirmwareCardsBmc.vue
similarity index 100%
rename from src/views/Configuration/Firmware/FirmwareCardsBmc.vue
rename to src/views/Operations/Firmware/FirmwareCardsBmc.vue
diff --git a/src/views/Configuration/Firmware/FirmwareCardsHost.vue b/src/views/Operations/Firmware/FirmwareCardsHost.vue
similarity index 100%
rename from src/views/Configuration/Firmware/FirmwareCardsHost.vue
rename to src/views/Operations/Firmware/FirmwareCardsHost.vue
diff --git a/src/views/Configuration/Firmware/FirmwareFormUpdate.vue b/src/views/Operations/Firmware/FirmwareFormUpdate.vue
similarity index 100%
rename from src/views/Configuration/Firmware/FirmwareFormUpdate.vue
rename to src/views/Operations/Firmware/FirmwareFormUpdate.vue
diff --git a/src/views/Configuration/Firmware/FirmwareModalSwitchToRunning.vue b/src/views/Operations/Firmware/FirmwareModalSwitchToRunning.vue
similarity index 100%
rename from src/views/Configuration/Firmware/FirmwareModalSwitchToRunning.vue
rename to src/views/Operations/Firmware/FirmwareModalSwitchToRunning.vue
diff --git a/src/views/Configuration/Firmware/FirmwareModalUpdateFirmware.vue b/src/views/Operations/Firmware/FirmwareModalUpdateFirmware.vue
similarity index 100%
rename from src/views/Configuration/Firmware/FirmwareModalUpdateFirmware.vue
rename to src/views/Operations/Firmware/FirmwareModalUpdateFirmware.vue
diff --git a/src/views/Configuration/Firmware/index.js b/src/views/Operations/Firmware/index.js
similarity index 100%
rename from src/views/Configuration/Firmware/index.js
rename to src/views/Operations/Firmware/index.js
diff --git a/src/views/Control/Kvm/Kvm.vue b/src/views/Operations/Kvm/Kvm.vue
similarity index 100%
rename from src/views/Control/Kvm/Kvm.vue
rename to src/views/Operations/Kvm/Kvm.vue
diff --git a/src/views/Control/Kvm/KvmConsole.vue b/src/views/Operations/Kvm/KvmConsole.vue
similarity index 100%
rename from src/views/Control/Kvm/KvmConsole.vue
rename to src/views/Operations/Kvm/KvmConsole.vue
diff --git a/src/views/Control/Kvm/index.js b/src/views/Operations/Kvm/index.js
similarity index 100%
rename from src/views/Control/Kvm/index.js
rename to src/views/Operations/Kvm/index.js
diff --git a/src/views/Control/ManagePowerUsage/ManagePowerUsage.vue b/src/views/Operations/ManagePowerUsage/ManagePowerUsage.vue
similarity index 100%
rename from src/views/Control/ManagePowerUsage/ManagePowerUsage.vue
rename to src/views/Operations/ManagePowerUsage/ManagePowerUsage.vue
diff --git a/src/views/Control/ManagePowerUsage/index.js b/src/views/Operations/ManagePowerUsage/index.js
similarity index 100%
rename from src/views/Control/ManagePowerUsage/index.js
rename to src/views/Operations/ManagePowerUsage/index.js
diff --git a/src/views/Control/PowerRestorePolicy/PowerRestorePolicy.vue b/src/views/Operations/PowerRestorePolicy/PowerRestorePolicy.vue
similarity index 100%
rename from src/views/Control/PowerRestorePolicy/PowerRestorePolicy.vue
rename to src/views/Operations/PowerRestorePolicy/PowerRestorePolicy.vue
diff --git a/src/views/Control/PowerRestorePolicy/index.js b/src/views/Operations/PowerRestorePolicy/index.js
similarity index 100%
rename from src/views/Control/PowerRestorePolicy/index.js
rename to src/views/Operations/PowerRestorePolicy/index.js
diff --git a/src/views/Control/RebootBmc/RebootBmc.vue b/src/views/Operations/RebootBmc/RebootBmc.vue
similarity index 100%
rename from src/views/Control/RebootBmc/RebootBmc.vue
rename to src/views/Operations/RebootBmc/RebootBmc.vue
diff --git a/src/views/Control/RebootBmc/index.js b/src/views/Operations/RebootBmc/index.js
similarity index 100%
rename from src/views/Control/RebootBmc/index.js
rename to src/views/Operations/RebootBmc/index.js
diff --git a/src/views/Control/SerialOverLan/SerialOverLan.vue b/src/views/Operations/SerialOverLan/SerialOverLan.vue
similarity index 100%
rename from src/views/Control/SerialOverLan/SerialOverLan.vue
rename to src/views/Operations/SerialOverLan/SerialOverLan.vue
diff --git a/src/views/Control/SerialOverLan/SerialOverLanConsole.vue b/src/views/Operations/SerialOverLan/SerialOverLanConsole.vue
similarity index 100%
rename from src/views/Control/SerialOverLan/SerialOverLanConsole.vue
rename to src/views/Operations/SerialOverLan/SerialOverLanConsole.vue
diff --git a/src/views/Control/SerialOverLan/index.js b/src/views/Operations/SerialOverLan/index.js
similarity index 100%
rename from src/views/Control/SerialOverLan/index.js
rename to src/views/Operations/SerialOverLan/index.js
diff --git a/src/views/Control/ServerPowerOperations/BootSettings.vue b/src/views/Operations/ServerPowerOperations/BootSettings.vue
similarity index 100%
rename from src/views/Control/ServerPowerOperations/BootSettings.vue
rename to src/views/Operations/ServerPowerOperations/BootSettings.vue
diff --git a/src/views/Control/ServerPowerOperations/ServerPowerOperations.vue b/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue
similarity index 100%
rename from src/views/Control/ServerPowerOperations/ServerPowerOperations.vue
rename to src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue
diff --git a/src/views/Control/ServerPowerOperations/index.js b/src/views/Operations/ServerPowerOperations/index.js
similarity index 100%
rename from src/views/Control/ServerPowerOperations/index.js
rename to src/views/Operations/ServerPowerOperations/index.js
diff --git a/src/views/Control/VirtualMedia/ModalConfigureConnection.vue b/src/views/Operations/VirtualMedia/ModalConfigureConnection.vue
similarity index 100%
rename from src/views/Control/VirtualMedia/ModalConfigureConnection.vue
rename to src/views/Operations/VirtualMedia/ModalConfigureConnection.vue
diff --git a/src/views/Control/VirtualMedia/VirtualMedia.vue b/src/views/Operations/VirtualMedia/VirtualMedia.vue
similarity index 100%
rename from src/views/Control/VirtualMedia/VirtualMedia.vue
rename to src/views/Operations/VirtualMedia/VirtualMedia.vue
diff --git a/src/views/Control/VirtualMedia/index.js b/src/views/Operations/VirtualMedia/index.js
similarity index 100%
rename from src/views/Control/VirtualMedia/index.js
rename to src/views/Operations/VirtualMedia/index.js
diff --git a/src/views/Overview/OverviewQuickLinks.vue b/src/views/Overview/OverviewQuickLinks.vue
index 7e2602e..9392c56 100644
--- a/src/views/Overview/OverviewQuickLinks.vue
+++ b/src/views/Overview/OverviewQuickLinks.vue
@@ -41,7 +41,7 @@
</div>
<div>
<b-button
- to="/control/serial-over-lan"
+ to="/operations/serial-over-lan"
variant="secondary"
data-test-id="overviewQuickLinks-button-solConsole"
class="d-flex justify-content-between align-items-center"
@@ -91,7 +91,6 @@
'serverLed/saveIndicatorLedActiveState',
indicatorLedActiveState
)
- .then((message) => this.successToast(message))
.catch(({ message }) => this.errorToast(message));
},
},
diff --git a/tests/unit/__snapshots__/AppHeader.spec.js.snap b/tests/unit/__snapshots__/AppHeader.spec.js.snap
index b472bcb..b9e3bf7 100644
--- a/tests/unit/__snapshots__/AppHeader.spec.js.snap
+++ b/tests/unit/__snapshots__/AppHeader.spec.js.snap
@@ -100,7 +100,7 @@
<b-nav-item
data-test-id="appHeader-container-power"
- to="/control/server-power-operations"
+ to="/operations/server-power-operations"
>
<span
class="status-icon secondary"
diff --git a/tests/unit/__snapshots__/AppNavigation.spec.js.snap b/tests/unit/__snapshots__/AppNavigation.spec.js.snap
index 92f6950..0ab0c9a 100644
--- a/tests/unit/__snapshots__/AppNavigation.spec.js.snap
+++ b/tests/unit/__snapshots__/AppNavigation.spec.js.snap
@@ -236,10 +236,10 @@
class="nav-item"
>
<button
- aria-controls="control"
+ aria-controls="operations"
aria-expanded="false"
class="btn btn-link collapsed"
- data-test-id="nav-button-control"
+ data-test-id="nav-button-operations"
type="button"
>
<svg
@@ -257,7 +257,7 @@
/>
</svg>
- appNavigation.control
+ appNavigation.operations
<svg
aria-hidden="true"
@@ -288,7 +288,7 @@
>
<ul
class="collapse"
- id="control"
+ id="operations"
style="display: none;"
>
<li
@@ -297,7 +297,7 @@
<a
class="nav-link"
data-test-id="nav-item-factory-reset"
- href="#/control/factory-reset"
+ href="#/operations/factory-reset"
>
appNavigation.factoryReset
@@ -306,7 +306,7 @@
<a
class="nav-link"
data-test-id="nav-item-kvm"
- href="#/control/kvm"
+ href="#/operations/kvm"
>
appNavigation.kvm
@@ -314,8 +314,17 @@
</a>
<a
class="nav-link"
+ data-test-id="nav-item-firmware"
+ href="#/operations/firmware"
+ >
+
+ appNavigation.firmware
+
+ </a>
+ <a
+ class="nav-link"
data-test-id="nav-item-manage-power-usage"
- href="#/control/manage-power-usage"
+ href="#/operations/manage-power-usage"
>
appNavigation.managePowerUsage
@@ -324,7 +333,7 @@
<a
class="nav-link"
data-test-id="nav-item-power-restore-policy"
- href="#/control/power-restore-policy"
+ href="#/operations/power-restore-policy"
>
appNavigation.powerRestorePolicy
@@ -333,7 +342,7 @@
<a
class="nav-link"
data-test-id="nav-item-reboot-bmc"
- href="#/control/reboot-bmc"
+ href="#/operations/reboot-bmc"
>
appNavigation.rebootBmc
@@ -342,7 +351,7 @@
<a
class="nav-link"
data-test-id="nav-item-serial-over-lan"
- href="#/control/serial-over-lan"
+ href="#/operations/serial-over-lan"
>
appNavigation.serialOverLan
@@ -350,17 +359,8 @@
</a>
<a
class="nav-link"
- data-test-id="nav-item-server-led"
- href="#/control/server-led"
- >
-
- appNavigation.serverLed
-
- </a>
- <a
- class="nav-link"
data-test-id="nav-item-server-power-operations"
- href="#/control/server-power-operations"
+ href="#/operations/server-power-operations"
>
appNavigation.serverPowerOperations
@@ -369,7 +369,7 @@
<a
class="nav-link"
data-test-id="nav-item-virtual-media"
- href="#/control/virtual-media"
+ href="#/operations/virtual-media"
>
appNavigation.virtualMedia
@@ -455,15 +455,6 @@
</a>
<a
class="nav-link"
- data-test-id="nav-item-firmware"
- href="#/configuration/firmware"
- >
-
- appNavigation.firmware
-
- </a>
- <a
- class="nav-link"
data-test-id="nav-item-network-settings"
href="#/configuration/network-settings"
>
@@ -848,10 +839,10 @@
class="nav-item"
>
<button
- aria-controls="control"
+ aria-controls="operations"
aria-expanded="false"
class="btn btn-link collapsed"
- data-test-id="nav-button-control"
+ data-test-id="nav-button-operations"
type="button"
>
<svg
@@ -869,7 +860,7 @@
/>
</svg>
- appNavigation.control
+ appNavigation.operations
<svg
aria-hidden="true"
@@ -900,7 +891,7 @@
>
<ul
class="collapse"
- id="control"
+ id="operations"
style="display: none;"
>
<li
@@ -909,7 +900,7 @@
<a
class="nav-link"
data-test-id="nav-item-factory-reset"
- href="#/control/factory-reset"
+ href="#/operations/factory-reset"
>
appNavigation.factoryReset
@@ -918,7 +909,7 @@
<a
class="nav-link"
data-test-id="nav-item-kvm"
- href="#/control/kvm"
+ href="#/operations/kvm"
>
appNavigation.kvm
@@ -926,8 +917,17 @@
</a>
<a
class="nav-link"
+ data-test-id="nav-item-firmware"
+ href="#/operations/firmware"
+ >
+
+ appNavigation.firmware
+
+ </a>
+ <a
+ class="nav-link"
data-test-id="nav-item-manage-power-usage"
- href="#/control/manage-power-usage"
+ href="#/operations/manage-power-usage"
>
appNavigation.managePowerUsage
@@ -936,7 +936,7 @@
<a
class="nav-link"
data-test-id="nav-item-power-restore-policy"
- href="#/control/power-restore-policy"
+ href="#/operations/power-restore-policy"
>
appNavigation.powerRestorePolicy
@@ -945,7 +945,7 @@
<a
class="nav-link"
data-test-id="nav-item-reboot-bmc"
- href="#/control/reboot-bmc"
+ href="#/operations/reboot-bmc"
>
appNavigation.rebootBmc
@@ -954,7 +954,7 @@
<a
class="nav-link"
data-test-id="nav-item-serial-over-lan"
- href="#/control/serial-over-lan"
+ href="#/operations/serial-over-lan"
>
appNavigation.serialOverLan
@@ -962,17 +962,8 @@
</a>
<a
class="nav-link"
- data-test-id="nav-item-server-led"
- href="#/control/server-led"
- >
-
- appNavigation.serverLed
-
- </a>
- <a
- class="nav-link"
data-test-id="nav-item-server-power-operations"
- href="#/control/server-power-operations"
+ href="#/operations/server-power-operations"
>
appNavigation.serverPowerOperations
@@ -981,7 +972,7 @@
<a
class="nav-link"
data-test-id="nav-item-virtual-media"
- href="#/control/virtual-media"
+ href="#/operations/virtual-media"
>
appNavigation.virtualMedia
@@ -1067,15 +1058,6 @@
</a>
<a
class="nav-link"
- data-test-id="nav-item-firmware"
- href="#/configuration/firmware"
- >
-
- appNavigation.firmware
-
- </a>
- <a
- class="nav-link"
data-test-id="nav-item-network-settings"
href="#/configuration/network-settings"
>