diff --git a/src/components/AppNavigation/AppNavigationMixin.js b/src/components/AppNavigation/AppNavigationMixin.js index 3a184026a..90e9d8008 100644 --- a/src/components/AppNavigation/AppNavigationMixin.js +++ b/src/components/AppNavigation/AppNavigationMixin.js @@ -97,9 +97,9 @@ const AppNavigationMixin = { route: '/operations/service-login', }, { - id: 'serial-over-lan', - label: this.$t('appNavigation.serialOverLan'), - route: '/operations/serial-over-lan', + id: 'host-console', + label: this.$t('appNavigation.hostConsole'), + route: '/operations/host-console', }, { id: 'server-power-operations', diff --git a/src/env/components/AppNavigation/ibm.js b/src/env/components/AppNavigation/ibm.js index 89584ab25..09031f48f 100644 --- a/src/env/components/AppNavigation/ibm.js +++ b/src/env/components/AppNavigation/ibm.js @@ -186,9 +186,9 @@ const AppNavigationMixin = { route: '/operations/reboot-bmc', }, { - id: 'serial-over-lan', - label: this.$t('appNavigation.serialOverLan'), - route: '/operations/serial-over-lan', + id: 'host-console', + label: this.$t('appNavigation.hostConsole'), + route: '/operations/host-console', }, { id: 'server-power-operations', diff --git a/src/env/components/AppNavigation/intel.js b/src/env/components/AppNavigation/intel.js index ea64da124..b7fecb3e9 100644 --- a/src/env/components/AppNavigation/intel.js +++ b/src/env/components/AppNavigation/intel.js @@ -82,9 +82,9 @@ const AppNavigationMixin = { route: '/operations/reboot-bmc', }, { - id: 'serial-over-lan', + id: 'host-console', label: this.$t('appNavigation.serialOverLan'), - route: '/operations/serial-over-lan', + route: '/operations/host-console', }, { id: 'server-power-operations', diff --git a/src/env/router/ibm.js b/src/env/router/ibm.js index 943ea6163..aabc2afe6 100644 --- a/src/env/router/ibm.js +++ b/src/env/router/ibm.js @@ -23,10 +23,10 @@ import RebootBmc from '@/views/Operations/RebootBmc'; import Policies from '@/views/SecurityAndAccess/Policies'; import KeyClear from '@/views/Operations/KeyClear'; import Sensors from '@/views/HardwareStatus/Sensors'; -import SerialOverLan from '@/views/Operations/SerialOverLan'; -import SerialOverLanConsole from '@/views/Operations/SerialOverLan/SerialOverLanConsole'; import ServiceLogin from '@/views/Operations/ServiceLoginConsoles/ServiceLogin'; import ServiceLoginConsoles from '@/views/Operations/ServiceLoginConsoles/ServiceLoginConsoles'; +import HostConsole from '@/views/Operations/HostConsole'; +import HostConsoleConsole from '@/views/Operations/HostConsole/HostConsoleConsole'; import ServerPowerOperations from '@/views/Operations/ServerPowerOperations'; import Certificates from '@/views/SecurityAndAccess/Certificates'; import Memory from '@/views/ResourceManagement/Memory'; @@ -80,11 +80,11 @@ const routes = [ }, }, { - path: 'serial-over-lan-console', - name: 'serial-over-lan-console', - component: SerialOverLanConsole, + path: 'host-console-console', + name: 'host-console-console', + component: HostConsoleConsole, meta: { - title: i18n.t('appPageTitle.serialOverLan'), + title: i18n.t('appPageTitle.hostConsole'), }, }, { @@ -313,11 +313,11 @@ const routes = [ }, }, { - path: '/operations/serial-over-lan', - name: 'serial-over-lan', - component: SerialOverLan, + path: '/operations/host-console', + name: 'host-console', + component: HostConsole, meta: { - title: i18n.t('appPageTitle.serialOverLan'), + title: i18n.t('appPageTitle.hostConsole'), }, }, { diff --git a/src/env/router/intel.js b/src/env/router/intel.js index b48e74315..12bbf8616 100644 --- a/src/env/router/intel.js +++ b/src/env/router/intel.js @@ -19,8 +19,8 @@ import ProfileSettings from '@/views/ProfileSettings'; import RebootBmc from '@/views/Operations/RebootBmc'; import Policies from '@/views/SecurityAndAccess/Policies'; import Sensors from '@/views/HardwareStatus/Sensors'; -import SerialOverLan from '@/views/Operations/SerialOverLan'; -import SerialOverLanConsole from '@/views/Operations/SerialOverLan/SerialOverLanConsole'; +import hostConsole from '@/views/Operations/hostConsole'; +import hostConsoleConsole from '@/views/Operations/hostConsole/hostConsoleConsole'; import ServerPowerOperations from '@/views/Operations/ServerPowerOperations'; import Certificates from '@/views/SecurityAndAccess/Certificates'; import VirtualMedia from '@/views/Operations/VirtualMedia'; @@ -60,11 +60,11 @@ const routes = [ }, children: [ { - path: 'serial-over-lan-console', - name: 'serial-over-lan-console', - component: SerialOverLanConsole, + path: 'host-console-console', + name: 'host-console-console', + component: hostConsoleConsole, meta: { - title: i18n.t('appPageTitle.serialOverLan'), + title: i18n.t('appPageTitle.hostConsole'), }, }, { @@ -221,11 +221,11 @@ const routes = [ }, }, { - path: '/operations/serial-over-lan', - name: 'serial-over-lan', - component: SerialOverLan, + path: '/operations/host-console', + name: 'host-console', + component: hostConsole, meta: { - title: i18n.t('appPageTitle.serialOverLan'), + title: i18n.t('appPageTitle.hostConsole'), }, }, { diff --git a/src/locales/en-US.json b/src/locales/en-US.json index f3c8d6412..caadca10f 100644 --- a/src/locales/en-US.json +++ b/src/locales/en-US.json @@ -128,7 +128,7 @@ "rebootBmc": "@:appPageTitle.rebootBmc", "policies": "@:appPageTitle.policies", "sensors": "@:appPageTitle.sensors", - "serialOverLan": "SOL console", + "hostConsole": "@:appPageTitle.hostConsole", "serverPowerOperations": "@:appPageTitle.serverPowerOperations", "certificates": "@:appPageTitle.certificates", "virtualMedia": "@:appPageTitle.virtualMedia", @@ -166,7 +166,7 @@ "rebootBmc": "Reboot BMC", "policies": "Policies", "sensors": "Sensors", - "serialOverLan": "Serial over LAN (SOL) console", + "hostConsole": "Host console", "serverPowerOperations": "Server power operations", "serviceLogin": "Service login consoles", "certificates": "Certificates", @@ -752,6 +752,7 @@ } }, "pageOverview": { + "hostConsole": "Host console", "backupVersion": "Backup", "bmcTime": "BMC date and time", "criticalEvents": "Critical", @@ -775,7 +776,6 @@ "serialNumber": "Serial number", "serverInformation": "Server information", "serviceLogin": "Service login", - "solConsole": "@:appNavigation.serialOverLan", "statusInformation": "Status information", "systemIdentifyLed": "System identify LED", "systemInformation": "System information", @@ -1004,12 +1004,12 @@ "upperCritical": "Upper critical" } }, - "pageSerialOverLan": { + "pageHostConsole": { "connected": "Connected", "disconnected": "Disconnected", "openNewTab": "Open in new tab", "status": "Status", - "subTitle": "SOL console redirects the server's serial port output to this window." + "subTitle": "Host console redirects the server's serial port output to this window." }, "pageServerPowerOperations": { "currentStatus": "Current status", diff --git a/src/locales/ru-RU.json b/src/locales/ru-RU.json index 10431be36..57f976965 100644 --- a/src/locales/ru-RU.json +++ b/src/locales/ru-RU.json @@ -122,7 +122,7 @@ "rebootBmc": "@:appPageTitle.rebootBmc", "policies": "@:appPageTitle.policies", "sensors": "@:appPageTitle.sensors", - "serialOverLan": "Консоль SOL", + "hostConsole": "Консоль SOL", "serverPowerOperations": "@:appPageTitle.serverPowerOperations", "certificates": "@:appPageTitle.certificates", "virtualMedia": "@:appPageTitle.virtualMedia", @@ -151,7 +151,7 @@ "rebootBmc": "Перезапуск BMC", "policies": "Политики безопасности", "sensors": "Датчики", - "serialOverLan": "Консоль Serial over LAN (SOL)", + "hostConsole": "Консоль Serial over LAN (SOL)", "serverPowerOperations": "Управление питанием сервера", "certificates": "Сертификаты", "virtualMedia": "Виртуальные носители" @@ -590,7 +590,7 @@ "runningVersion": "Рабочий", "serialNumber": "Серийный номер", "serverInformation": "Информация о сервере", - "solConsole": "@:appNavigation.serialOverLan", + "solConsole": "@:appNavigation.hostConsole", "statusInformation": "Информация о статусе", "systemIdentifyLed": "Идентификационный LED системы", "systemInformation": "Информация о системе", @@ -758,7 +758,7 @@ "upperCritical": "Макс. крит. значение" } }, - "pageSerialOverLan": { + "pageHostConsole": { "connected": "Подключено", "disconnected": "Отключено", "openNewTab": "Открыть в новом окне", diff --git a/src/router/routes.js b/src/router/routes.js index 46ef7e7dc..796ead39a 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -25,8 +25,8 @@ import RebootBmc from '@/views/Operations/RebootBmc'; import Policies from '@/views/SecurityAndAccess/Policies'; import KeyClear from '@/views/Operations/KeyClear'; import Sensors from '@/views/HardwareStatus/Sensors'; -import SerialOverLan from '@/views/Operations/SerialOverLan'; -import SerialOverLanConsole from '@/views/Operations/SerialOverLan/SerialOverLanConsole'; +import HostConsole from '@/views/Operations/hostConsole'; +import hostConsoleConsole from '@/views/Operations/hostConsole/hostConsoleConsole'; import ServerPowerOperations from '@/views/Operations/ServerPowerOperations'; import Certificates from '@/views/SecurityAndAccess/Certificates'; import VirtualMedia from '@/views/Operations/VirtualMedia'; @@ -67,11 +67,11 @@ const routes = [ }, children: [ { - path: 'serial-over-lan-console', - name: 'serial-over-lan-console', - component: SerialOverLanConsole, + path: 'host-console-console', + name: 'host-console', + component: hostConsoleConsole, meta: { - title: i18n.t('appPageTitle.serialOverLan'), + title: i18n.t('appPageTitle.hostConsole'), }, }, { @@ -284,11 +284,11 @@ const routes = [ }, }, { - path: '/operations/serial-over-lan', - name: 'serial-over-lan', - component: SerialOverLan, + path: '@:appPageTitle.hostConsole', + name: 'host-console', + component: HostConsole, meta: { - title: i18n.t('appPageTitle.serialOverLan'), + title: i18n.t('appPageTitle.hostConsole'), }, }, { diff --git a/src/views/Operations/SerialOverLan/SerialOverLan.vue b/src/views/Operations/HostConsole/HostConsole.vue similarity index 56% rename from src/views/Operations/SerialOverLan/SerialOverLan.vue rename to src/views/Operations/HostConsole/HostConsole.vue index 48a683459..3d32c346f 100644 --- a/src/views/Operations/SerialOverLan/SerialOverLan.vue +++ b/src/views/Operations/HostConsole/HostConsole.vue @@ -1,9 +1,9 @@ @@ -11,14 +11,14 @@ diff --git a/src/views/Operations/SerialOverLan/SerialOverLanConsole.vue b/src/views/Operations/HostConsole/HostConsoleConsole.vue similarity index 92% rename from src/views/Operations/SerialOverLan/SerialOverLanConsole.vue rename to src/views/Operations/HostConsole/HostConsoleConsole.vue index 4244a75a1..6060bd5de 100644 --- a/src/views/Operations/SerialOverLan/SerialOverLanConsole.vue +++ b/src/views/Operations/HostConsole/HostConsoleConsole.vue @@ -4,7 +4,7 @@
- {{ $t('pageSerialOverLan.status') }}: + {{ $t('pageHostConsole.status') }}:
{{ connectionStatus }} @@ -15,7 +15,7 @@ - {{ $t('pageSerialOverLan.openNewTab') }} + {{ $t('pageHostConsole.openNewTab') }} @@ -32,7 +32,7 @@ import IconLaunch from '@carbon/icons-vue/es/launch/20'; import StatusIcon from '@/components/Global/StatusIcon'; export default { - name: 'SerialOverLanConsole', + name: 'HostConsoleConsole', components: { IconLaunch, StatusIcon, @@ -57,8 +57,8 @@ export default { }, connectionStatus() { return this.serverStatus === 'on' - ? this.$t('pageSerialOverLan.connected') - : this.$t('pageSerialOverLan.disconnected'); + ? this.$t('pageHostConsole.connected') + : this.$t('pageHostConsole.disconnected'); }, }, created() { @@ -125,7 +125,7 @@ export default { }, openConsoleWindow() { window.open( - '#/console/serial-over-lan-console', + '#/console/host-console-console', '_blank', 'directories=no,titlebar=no,toolbar=no,location=no,status=no,menubar=no,scrollbars=no,resizable=yes,width=600,height=550' ); diff --git a/src/views/Operations/HostConsole/index.js b/src/views/Operations/HostConsole/index.js new file mode 100644 index 000000000..8ead04f9a --- /dev/null +++ b/src/views/Operations/HostConsole/index.js @@ -0,0 +1,2 @@ +import HostConsole from './HostConsole.vue'; +export default HostConsole; diff --git a/src/views/Operations/SerialOverLan/index.js b/src/views/Operations/SerialOverLan/index.js deleted file mode 100644 index 7c8bc7c07..000000000 --- a/src/views/Operations/SerialOverLan/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import SerialOverLan from './SerialOverLan.vue'; -export default SerialOverLan; diff --git a/src/views/Overview/OverviewQuickLinks.vue b/src/views/Overview/OverviewQuickLinks.vue index bc579b034..d435a4ceb 100644 --- a/src/views/Overview/OverviewQuickLinks.vue +++ b/src/views/Overview/OverviewQuickLinks.vue @@ -12,12 +12,12 @@ - {{ $t('pageOverview.solConsole') }} + {{ $t('pageOverview.hostConsole') }} diff --git a/tests/unit/__snapshots__/AppNavigation.spec.js.snap b/tests/unit/__snapshots__/AppNavigation.spec.js.snap index ec02397d3..da4f863f2 100644 --- a/tests/unit/__snapshots__/AppNavigation.spec.js.snap +++ b/tests/unit/__snapshots__/AppNavigation.spec.js.snap @@ -350,11 +350,11 @@ exports[`AppNavigation.vue should render correctly 1`] = ` - appNavigation.serialOverLan + appNavigation.hostConsole - appNavigation.serialOverLan + appNavigation.hostConsole