Renamed "Serial over LAN (SOL) console" page (#54)

- Renamed "Serial over LAN (SOL) console" page to "Host console" Signed-off-by: Kenneth Fullbright <kennyneedsmilky@gmail.com>
ibm-openbmc · Mar 11, 2022 · e15c416 · e15c416
1 parent 7cd10bb
commit e15c416
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 68 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...perations/SerialOverLan/SerialOverLan.vue → ...ws/Operations/HostConsole/HostConsole.vue b/...perations/SerialOverLan/SerialOverLan.vue → ...ws/Operations/HostConsole/HostConsole.vue
@@ -1,24 +1,24 @@
 <template>
   <b-container fluid="xl">
-    <page-title class="mb-4" :description="$t('pageSerialOverLan.subTitle')" />
+    <page-title class="mb-4" :description="$t('pageHostConsole.subTitle')" />
 
     <page-section class="mb-0">
-      <serial-over-lan-console :is-full-window="false" />
+      <host-console-console :is-full-window="false" />
     </page-section>
   </b-container>
 </template>
 
 <script>
 import PageTitle from '@/components/Global/PageTitle';
 import PageSection from '@/components/Global/PageSection';
-import SerialOverLanConsole from './SerialOverLanConsole';
+import HostConsoleConsole from './HostConsoleConsole';
 
 export default {
-  name: 'SerialOverLan',
+  name: 'HostConsole',
   components: {
     PageSection,
     PageTitle,
-    SerialOverLanConsole,
+    HostConsoleConsole,
   },
 };
 </script>
diff --git a/...ns/SerialOverLan/SerialOverLanConsole.vue → ...ations/HostConsole/HostConsoleConsole.vue b/...ns/SerialOverLan/SerialOverLanConsole.vue → ...ations/HostConsole/HostConsoleConsole.vue
@@ -4,7 +4,7 @@
       <b-col class="d-flex flex-column justify-content-end">
         <dl class="mb-2" sm="6" md="6">
           <dt class="d-inline font-weight-bold mr-1">
-            {{ $t('pageSerialOverLan.status') }}:
+            {{ $t('pageHostConsole.status') }}:
           </dt>
           <dd class="d-inline">
             <status-icon :status="serverStatusIcon" /> {{ connectionStatus }}
@@ -15,7 +15,7 @@
       <b-col v-if="!isFullWindow" class="d-flex justify-content-end">
         <b-button variant="link" type="button" @click="openConsoleWindow()">
           <icon-launch />
-          {{ $t('pageSerialOverLan.openNewTab') }}
+          {{ $t('pageHostConsole.openNewTab') }}
         </b-button>
       </b-col>
     </b-row>
@@ -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
@@ -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
diff --git a/src/views/Overview/OverviewQuickLinks.vue b/src/views/Overview/OverviewQuickLinks.vue
@@ -12,12 +12,12 @@
       </b-col>
       <b-col sm="6" lg="3" class="mb-2 mt-2">
         <b-button
-          to="/operations/serial-over-lan"
+          to="/operations/host-console"
           variant="secondary"
           data-test-id="overviewQuickLinks-button-solConsole"
           class="d-flex justify-content-between align-items-center"
         >
-          {{ $t('pageOverview.solConsole') }}
+          {{ $t('pageOverview.hostConsole') }}
           <icon-arrow-right />
         </b-button>
       </b-col>

diff --git 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`] = `
                 </a>
                 <a
                   class="nav-link"
-                  data-test-id="nav-item-serial-over-lan"
-                  href="#/operations/serial-over-lan"
+                  data-test-id="nav-item-host-console"
+                  href="#/operations/host-console"
                 >
                   
-                  appNavigation.serialOverLan
+                  appNavigation.hostConsole
                 
                 </a>
                 <a
@@ -1056,11 +1056,11 @@ exports[`AppNavigation.vue should render with nav-container open 1`] = `
                 </a>
                 <a
                   class="nav-link"
-                  data-test-id="nav-item-serial-over-lan"
-                  href="#/operations/serial-over-lan"
+                  data-test-id="nav-item-host-console"
+                  href="#/operations/host-console"
                 >
                   
-                  appNavigation.serialOverLan
+                  appNavigation.hostConsole
                 
                 </a>
                 <a