From 5cfc7aa3816a553470212f582746dc5f8b9fe477 Mon Sep 17 00:00:00 2001
From: Kunhui-Li <kunhuix.li@intel.com>
Date: Tue, 24 May 2022 14:57:24 +0800
Subject: [PATCH] config_tools: rename "Virtio console" to "virtio serial port
 (as console)"

virtio serial port and virtio console are all based on virito serial port.
but virtio serial port functionally can not be used as console,
which may lead to user confusion, so explicitly specify the point by
changing the item name as follows:
Virtio console -> virtio serial port (as console)

Tracked-On: #7540
Signed-off-by: Kunhui-Li <kunhuix.li@intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
---
 .../ConfigForm/CustomWidget/Virtio/Console.vue  | 17 ++++++++++++++---
 misc/config_tools/schema/VMtypes.xsd            |  8 ++++++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/misc/config_tools/configurator/packages/configurator/src/pages/Config/ConfigForm/CustomWidget/Virtio/Console.vue b/misc/config_tools/configurator/packages/configurator/src/pages/Config/ConfigForm/CustomWidget/Virtio/Console.vue
index f75ff9bc0..49f7b73d7 100644
--- a/misc/config_tools/configurator/packages/configurator/src/pages/Config/ConfigForm/CustomWidget/Virtio/Console.vue
+++ b/misc/config_tools/configurator/packages/configurator/src/pages/Config/ConfigForm/CustomWidget/Virtio/Console.vue
@@ -8,7 +8,7 @@
             <label>Use type: </label>
           </b-col>
           <b-col md="4">
-            <b-form-select v-model="console.use_type" :options="ConsoleUseType"/>
+            <b-form-select v-model="console.use_type" :options="getUseTypes"/>
           </b-col>
         </b-row>
 
@@ -95,7 +95,8 @@ export default {
   },
   data() {
     return {
-      ConsoleUseType: this.rootSchema.definitions['VirtioConsoleUseType']['enum'],
+      enumNames: this.rootSchema.definitions['VirtioConsoleUseType']['enumNames'],
+      enum: this.rootSchema.definitions['VirtioConsoleUseType']['enum'],
       ConsoleBackendType: this.rootSchema.definitions['BasicVirtioConsoleBackendType']['enum'],
       defaultVal: vueUtils.getPathVal(this.rootFormData, this.curNodePath)
     };
@@ -117,6 +118,16 @@ export default {
       deep: true
     }
   },
+  computed: {
+    getUseTypes() {
+      let enumOptions = []
+      for (let i = 0; i < this.enumNames.length; i++) {
+        let enumOption = {text: this.enumNames[i], value: this.enum[i]}
+        enumOptions.push(enumOption)
+      }
+      return enumOptions
+    },
+  },
   methods: {
     removeVirtioConsole(index) {
       this.defaultVal.splice(index, 1);
@@ -165,4 +176,4 @@ export default {
   border-radius: 5px;
   margin-bottom: 1rem;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/misc/config_tools/schema/VMtypes.xsd b/misc/config_tools/schema/VMtypes.xsd
index e89d248de..4f7a4777b 100644
--- a/misc/config_tools/schema/VMtypes.xsd
+++ b/misc/config_tools/schema/VMtypes.xsd
@@ -339,8 +339,12 @@ The size is a subset of the VM's total memory size specified on the Basic tab.</
        <xs:documentation>A string with value: ``Virtio console`` or ``Virtio serial port``</xs:documentation>
   </xs:annotation>
   <xs:restriction base="xs:string">
-    <xs:enumeration value="Virtio console" />
-    <xs:enumeration value="Virtio serial port" />
+    <xs:enumeration value="Virtio console" >
+      <xs:annotation acrn:title="virtio serial port (as console)" />
+    </xs:enumeration>
+    <xs:enumeration value="Virtio serial port" >
+      <xs:annotation acrn:title="virtio serial port" />
+    </xs:enumeration>
   </xs:restriction>
 </xs:simpleType>