From a71a13d8b4f984e22d4117e89c7d88f8d4628aaf Mon Sep 17 00:00:00 2001
From: gaoruoshu <gaoruoshu@huawei.com>
Date: Mon, 11 Jan 2021 16:21:21 +0800
Subject: [PATCH] update file description and testcase

---
 Documentation/UserGuide/A-Tune-User-Guide.md       |  2 +-
 ...224\250\346\210\267\346\214\207\345\215\227.md" |  2 +-
 profiles/basic-test-suite/baseline/fio.conf        | 53 ++++++++++++++++++++++
 profiles/basic-test-suite/baseline/lmbench.conf    | 49 ++++++++++++++++++++
 profiles/basic-test-suite/baseline/netperf.conf    | 48 ++++++++++++++++++++
 profiles/basic-test-suite/baseline/stream.conf     | 48 ++++++++++++++++++++
 profiles/basic-test-suite/baseline/unixbench.conf  | 51 +++++++++++++++++++++
 .../basic-test-suite/euleros-baseline/fio.conf     | 53 ----------------------
 .../basic-test-suite/euleros-baseline/lmbench.conf | 49 --------------------
 .../basic-test-suite/euleros-baseline/netperf.conf | 48 --------------------
 .../basic-test-suite/euleros-baseline/stream.conf  | 48 --------------------
 .../euleros-baseline/unixbench.conf                | 51 ---------------------
 tests/configurator/test_kernel_config.py           |  4 +-
 13 files changed, 253 insertions(+), 253 deletions(-)
 create mode 100644 profiles/basic-test-suite/baseline/fio.conf
 create mode 100644 profiles/basic-test-suite/baseline/lmbench.conf
 create mode 100644 profiles/basic-test-suite/baseline/netperf.conf
 create mode 100644 profiles/basic-test-suite/baseline/stream.conf
 create mode 100644 profiles/basic-test-suite/baseline/unixbench.conf
 delete mode 100644 profiles/basic-test-suite/euleros-baseline/fio.conf
 delete mode 100644 profiles/basic-test-suite/euleros-baseline/lmbench.conf
 delete mode 100644 profiles/basic-test-suite/euleros-baseline/netperf.conf
 delete mode 100644 profiles/basic-test-suite/euleros-baseline/stream.conf
 delete mode 100644 profiles/basic-test-suite/euleros-baseline/unixbench.conf

diff --git a/Documentation/UserGuide/A-Tune-User-Guide.md b/Documentation/UserGuide/A-Tune-User-Guide.md
index d798d8a..bffface 100644
--- a/Documentation/UserGuide/A-Tune-User-Guide.md
+++ b/Documentation/UserGuide/A-Tune-User-Guide.md
@@ -763,7 +763,7 @@ Check the CPU, BIOS, OS, and NIC information.
    cpu:1  version: Kunpeng 920-6426 speed: 2600000000 HZ  cores: 64 
  system information: 
    DMIBIOSVersion: 0.59 
-   OSRelease: 4.19.36-vhulk1906.3.0.h356.eulerosv2r8.aarch64 
+   OSRelease: ... 
  network information: 
    name: eth0       product: HNS GE/10GE/25GE RDMA Network Controller 
    name: eth1       product: HNS GE/10GE/25GE Network Controller 
diff --git "a/Documentation/UserGuide/A-Tune\347\224\250\346\210\267\346\214\207\345\215\227.md" "b/Documentation/UserGuide/A-Tune\347\224\250\346\210\267\346\214\207\345\215\227.md"
index cf1fcbf..070aefc 100644
--- "a/Documentation/UserGuide/A-Tune\347\224\250\346\210\267\346\214\207\345\215\227.md"
+++ "b/Documentation/UserGuide/A-Tune\347\224\250\346\210\267\346\214\207\345\215\227.md"
@@ -774,7 +774,7 @@ WORKLOAD_TYPE支持的类型参考list命令查询结果。
    cpu:1  version: Kunpeng 920-6426 speed: 2600000000 HZ  cores: 64 
  system information: 
    DMIBIOSVersion: 0.59 
-   OSRelease: 4.19.36-vhulk1906.3.0.h356.eulerosv2r8.aarch64 
+   OSRelease: ...
  network information: 
    name: eth0       product: HNS GE/10GE/25GE RDMA Network Controller 
    name: eth1       product: HNS GE/10GE/25GE Network Controller 
diff --git a/profiles/basic-test-suite/baseline/fio.conf b/profiles/basic-test-suite/baseline/fio.conf
new file mode 100644
index 0000000..7427d94
--- /dev/null
+++ b/profiles/basic-test-suite/baseline/fio.conf
@@ -0,0 +1,53 @@
+# Copyright (c) 2020 Huawei Technologies Co., Ltd.
+# A-Tune is licensed under the Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+#     http://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
+# PURPOSE.
+# See the Mulan PSL v2 for more details.
+# Create: 2020-06-18
+#
+# baseline test fio A-Tune configuration
+#
+[main]
+include = include-basic-test-suite
+
+[kernel_config]
+#TODO CONFIG
+
+[bios]
+#TODO CONFIG
+
+[bootloader.grub2]
+#TODO CONFIG
+
+[sysfs]
+block/{disk}/queue/scheduler = mq-deadline
+block/{disk}/queue/max_sectors_kb = 1024
+block/{disk}/queue/read_ahead_kb = 4096
+block/{disk}/queue/rq_affinity = 2
+
+[systemctl]
+#TODO CONFIG
+
+[sysctl]
+#TODO CONFIG
+
+[script]
+#TODO CONFIG
+
+[ulimit]
+#TODO CONFIG
+
+[schedule_policy]
+#TODO CONFIG
+
+[check]
+#TODO CONFIG
+
+[tip]
+set /sys/block/{disk}/queue/iosched/retry_dev to 8 colon 16 = sysfs
+set /sys/block/{disk}/queue/iosched/retry_count to 8 = sysfs
+set /sys/block/{disk}/queue/iosched/retry_min_write to 2 = sysfs
diff --git a/profiles/basic-test-suite/baseline/lmbench.conf b/profiles/basic-test-suite/baseline/lmbench.conf
new file mode 100644
index 0000000..3055e9e
--- /dev/null
+++ b/profiles/basic-test-suite/baseline/lmbench.conf
@@ -0,0 +1,49 @@
+# Copyright (c) 2020 Huawei Technologies Co., Ltd.
+# A-Tune is licensed under the Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+#     http://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
+# PURPOSE.
+# See the Mulan PSL v2 for more details.
+# Create: 2020-06-18
+#
+# baseline test lmbench A-Tune configuration
+#
+[main]
+include = include-basic-test-suite
+
+[kernel_config]
+#TODO CONFIG
+
+[bios]
+#TODO CONFIG
+
+[bootloader.grub2]
+#TODO CONFIG
+
+[sysfs]
+#TODO CONFIG
+
+[systemctl]
+#TODO CONFIG
+
+[sysctl]
+#TODO CONFIG
+
+[script]
+#TODO CONFIG
+
+[ulimit]
+#TODO CONFIG
+
+[schedule_policy]
+#TODO CONFIG
+
+[check]
+#TODO CONFIG
+
+[tip]
+mkfs.ext4 -b 16384 -O ^metadata_csum /dev/{disk} and restart the host = block
+modify compilation options from -O to -O2 = compile
diff --git a/profiles/basic-test-suite/baseline/netperf.conf b/profiles/basic-test-suite/baseline/netperf.conf
new file mode 100644
index 0000000..8a5fa06
--- /dev/null
+++ b/profiles/basic-test-suite/baseline/netperf.conf
@@ -0,0 +1,48 @@
+# Copyright (c) 2020 Huawei Technologies Co., Ltd.
+# A-Tune is licensed under the Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+#     http://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
+# PURPOSE.
+# See the Mulan PSL v2 for more details.
+# Create: 2020-06-18
+#
+# baseline test netperf A-Tune configuration
+#
+[main]
+include = include-basic-test-suite
+
+[kernel_config]
+#TODO CONFIG
+
+[bios]
+#TODO CONFIG
+
+[bootloader.grub2]
+#TODO CONFIG
+
+[sysfs]
+#TODO CONFIG
+
+[systemctl]
+#TODO CONFIG
+
+[sysctl]
+#TODO CONFIG
+
+[script]
+#TODO CONFIG
+
+[ulimit]
+#TODO CONFIG
+
+[schedule_policy]
+#TODO CONFIG
+
+[check]
+#TODO CONFIG
+
+[tip]
+#TODO CONFIG
diff --git a/profiles/basic-test-suite/baseline/stream.conf b/profiles/basic-test-suite/baseline/stream.conf
new file mode 100644
index 0000000..0220811
--- /dev/null
+++ b/profiles/basic-test-suite/baseline/stream.conf
@@ -0,0 +1,48 @@
+# Copyright (c) 2020 Huawei Technologies Co., Ltd.
+# A-Tune is licensed under the Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+#     http://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
+# PURPOSE.
+# See the Mulan PSL v2 for more details.
+# Create: 2020-06-18
+#
+# baseline test stream A-Tune configuration
+#
+[main]
+include = include-basic-test-suite
+
+[kernel_config]
+#TODO CONFIG
+
+[bios]
+#TODO CONFIG
+
+[bootloader.grub2]
+#TODO CONFIG
+
+[sysfs]
+#TODO CONFIG
+
+[systemctl]
+#TODO CONFIG
+
+[sysctl]
+#TODO CONFIG
+
+[script]
+#TODO CONFIG
+
+[ulimit]
+#TODO CONFIG
+
+[schedule_policy]
+#TODO CONFIG
+
+[check]
+#TODO CONFIG
+
+[tip]
+add -ftree-vectorize compilation option in gcc compilation = application
diff --git a/profiles/basic-test-suite/baseline/unixbench.conf b/profiles/basic-test-suite/baseline/unixbench.conf
new file mode 100644
index 0000000..9d93246
--- /dev/null
+++ b/profiles/basic-test-suite/baseline/unixbench.conf
@@ -0,0 +1,51 @@
+# Copyright (c) 2020 Huawei Technologies Co., Ltd.
+# A-Tune is licensed under the Mulan PSL v2.
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
+# You may obtain a copy of Mulan PSL v2 at:
+#     http://license.coscl.org.cn/MulanPSL2
+# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
+# PURPOSE.
+# See the Mulan PSL v2 for more details.
+# Create: 2020-06-18
+#
+# baseline test unixbench A-Tune configuration
+#
+[main]
+include = include-throughput-performance, include-basic-test-suite
+
+[kernel_config]
+#TODO CONFIG
+
+[bios]
+#TODO CONFIG
+
+[bootloader.grub2]
+#TODO CONFIG
+
+[sysfs]
+#TODO CONFIG
+
+[systemctl]
+#TODO CONFIG
+
+[sysctl]
+#TODO CONFIG
+
+[script]
+#TODO CONFIG
+
+[ulimit]
+#TODO CONFIG
+
+[schedule_policy]
+#TODO CONFIG
+
+[check]
+#TODO CONFIG
+
+[tip]
+format the test block {disk} size to 64KB = block
+use writeback, nojournal_checksum, noatime, nobarrier, noinit_itable, noacl and dioread_nolock to mount the test partition and set inode_readahead_blks to 4096 = block
+add --without-gmp compilation option to coreutils package and upgrade the package = compile
+add --static to the environment variable LDFLAGS during the compilation of bash package and upgrade the package = compile
diff --git a/profiles/basic-test-suite/euleros-baseline/fio.conf b/profiles/basic-test-suite/euleros-baseline/fio.conf
deleted file mode 100644
index 330d43b..0000000
--- a/profiles/basic-test-suite/euleros-baseline/fio.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (c) 2020 Huawei Technologies Co., Ltd.
-# A-Tune is licensed under the Mulan PSL v2.
-# You can use this software according to the terms and conditions of the Mulan PSL v2.
-# You may obtain a copy of Mulan PSL v2 at:
-#     http://license.coscl.org.cn/MulanPSL2
-# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
-# PURPOSE.
-# See the Mulan PSL v2 for more details.
-# Create: 2020-06-18
-#
-# euleros baseline test fio A-Tune configuration
-#
-[main]
-include = include-basic-test-suite
-
-[kernel_config]
-#TODO CONFIG
-
-[bios]
-#TODO CONFIG
-
-[bootloader.grub2]
-#TODO CONFIG
-
-[sysfs]
-block/{disk}/queue/scheduler = mq-deadline
-block/{disk}/queue/max_sectors_kb = 1024
-block/{disk}/queue/read_ahead_kb = 4096
-block/{disk}/queue/rq_affinity = 2
-
-[systemctl]
-#TODO CONFIG
-
-[sysctl]
-#TODO CONFIG
-
-[script]
-#TODO CONFIG
-
-[ulimit]
-#TODO CONFIG
-
-[schedule_policy]
-#TODO CONFIG
-
-[check]
-#TODO CONFIG
-
-[tip]
-set /sys/block/{disk}/queue/iosched/retry_dev to 8 colon 16 = sysfs
-set /sys/block/{disk}/queue/iosched/retry_count to 8 = sysfs
-set /sys/block/{disk}/queue/iosched/retry_min_write to 2 = sysfs
diff --git a/profiles/basic-test-suite/euleros-baseline/lmbench.conf b/profiles/basic-test-suite/euleros-baseline/lmbench.conf
deleted file mode 100644
index 9ce64a4..0000000
--- a/profiles/basic-test-suite/euleros-baseline/lmbench.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright (c) 2020 Huawei Technologies Co., Ltd.
-# A-Tune is licensed under the Mulan PSL v2.
-# You can use this software according to the terms and conditions of the Mulan PSL v2.
-# You may obtain a copy of Mulan PSL v2 at:
-#     http://license.coscl.org.cn/MulanPSL2
-# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
-# PURPOSE.
-# See the Mulan PSL v2 for more details.
-# Create: 2020-06-18
-#
-# euleros baseline test lmbench A-Tune configuration
-#
-[main]
-include = include-basic-test-suite
-
-[kernel_config]
-#TODO CONFIG
-
-[bios]
-#TODO CONFIG
-
-[bootloader.grub2]
-#TODO CONFIG
-
-[sysfs]
-#TODO CONFIG
-
-[systemctl]
-#TODO CONFIG
-
-[sysctl]
-#TODO CONFIG
-
-[script]
-#TODO CONFIG
-
-[ulimit]
-#TODO CONFIG
-
-[schedule_policy]
-#TODO CONFIG
-
-[check]
-#TODO CONFIG
-
-[tip]
-mkfs.ext4 -b 16384 -O ^metadata_csum /dev/{disk} and restart the host = block
-modify compilation options from -O to -O2 = compile
diff --git a/profiles/basic-test-suite/euleros-baseline/netperf.conf b/profiles/basic-test-suite/euleros-baseline/netperf.conf
deleted file mode 100644
index 1470e07..0000000
--- a/profiles/basic-test-suite/euleros-baseline/netperf.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (c) 2020 Huawei Technologies Co., Ltd.
-# A-Tune is licensed under the Mulan PSL v2.
-# You can use this software according to the terms and conditions of the Mulan PSL v2.
-# You may obtain a copy of Mulan PSL v2 at:
-#     http://license.coscl.org.cn/MulanPSL2
-# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
-# PURPOSE.
-# See the Mulan PSL v2 for more details.
-# Create: 2020-06-18
-#
-# euleros baseline test netperf A-Tune configuration
-#
-[main]
-include = include-basic-test-suite
-
-[kernel_config]
-#TODO CONFIG
-
-[bios]
-#TODO CONFIG
-
-[bootloader.grub2]
-#TODO CONFIG
-
-[sysfs]
-#TODO CONFIG
-
-[systemctl]
-#TODO CONFIG
-
-[sysctl]
-#TODO CONFIG
-
-[script]
-#TODO CONFIG
-
-[ulimit]
-#TODO CONFIG
-
-[schedule_policy]
-#TODO CONFIG
-
-[check]
-#TODO CONFIG
-
-[tip]
-#TODO CONFIG
diff --git a/profiles/basic-test-suite/euleros-baseline/stream.conf b/profiles/basic-test-suite/euleros-baseline/stream.conf
deleted file mode 100644
index 602a7c4..0000000
--- a/profiles/basic-test-suite/euleros-baseline/stream.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (c) 2020 Huawei Technologies Co., Ltd.
-# A-Tune is licensed under the Mulan PSL v2.
-# You can use this software according to the terms and conditions of the Mulan PSL v2.
-# You may obtain a copy of Mulan PSL v2 at:
-#     http://license.coscl.org.cn/MulanPSL2
-# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
-# PURPOSE.
-# See the Mulan PSL v2 for more details.
-# Create: 2020-06-18
-#
-# euleros baseline test stream A-Tune configuration
-#
-[main]
-include = include-basic-test-suite
-
-[kernel_config]
-#TODO CONFIG
-
-[bios]
-#TODO CONFIG
-
-[bootloader.grub2]
-#TODO CONFIG
-
-[sysfs]
-#TODO CONFIG
-
-[systemctl]
-#TODO CONFIG
-
-[sysctl]
-#TODO CONFIG
-
-[script]
-#TODO CONFIG
-
-[ulimit]
-#TODO CONFIG
-
-[schedule_policy]
-#TODO CONFIG
-
-[check]
-#TODO CONFIG
-
-[tip]
-add -ftree-vectorize compilation option in gcc compilation = application
diff --git a/profiles/basic-test-suite/euleros-baseline/unixbench.conf b/profiles/basic-test-suite/euleros-baseline/unixbench.conf
deleted file mode 100644
index fb74ab6..0000000
--- a/profiles/basic-test-suite/euleros-baseline/unixbench.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (c) 2020 Huawei Technologies Co., Ltd.
-# A-Tune is licensed under the Mulan PSL v2.
-# You can use this software according to the terms and conditions of the Mulan PSL v2.
-# You may obtain a copy of Mulan PSL v2 at:
-#     http://license.coscl.org.cn/MulanPSL2
-# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
-# PURPOSE.
-# See the Mulan PSL v2 for more details.
-# Create: 2020-06-18
-#
-# euleros baseline test unixbench A-Tune configuration
-#
-[main]
-include = include-throughput-performance, include-basic-test-suite
-
-[kernel_config]
-#TODO CONFIG
-
-[bios]
-#TODO CONFIG
-
-[bootloader.grub2]
-#TODO CONFIG
-
-[sysfs]
-#TODO CONFIG
-
-[systemctl]
-#TODO CONFIG
-
-[sysctl]
-#TODO CONFIG
-
-[script]
-#TODO CONFIG
-
-[ulimit]
-#TODO CONFIG
-
-[schedule_policy]
-#TODO CONFIG
-
-[check]
-#TODO CONFIG
-
-[tip]
-format the test block {disk} size to 64KB = block
-use writeback, nojournal_checksum, noatime, nobarrier, noinit_itable, noacl and dioread_nolock to mount the test partition and set inode_readahead_blks to 4096 = block
-add --without-gmp compilation option to coreutils package and upgrade the package = compile
-add --static to the environment variable LDFLAGS during the compilation of bash package and upgrade the package = compile
diff --git a/tests/configurator/test_kernel_config.py b/tests/configurator/test_kernel_config.py
index d6dfa7a..9be5485 100644
--- a/tests/configurator/test_kernel_config.py
+++ b/tests/configurator/test_kernel_config.py
@@ -21,13 +21,13 @@ from analysis.plugin.public import NeedConfigWarning
 class TestKernelConfig:
     """ test kernel config"""
     user = "UT"
-    config_key = "CONFIG_EULEROS_DETAILED_RAS_INFO"
+    config_key = "CONFIG_KDB_KEYBOARD"
 
     def test_get_kernel_config_no_exist(self):
         """test get kernel config with no exist"""
         try:
             kernel_config = KernelConfig(self.user)
-            value = kernel_config.get("CONFIG_EULEROS_TEST_KERNEL_CONFIG")
+            value = kernel_config.get("CONFIG_TEST_KERNEL_CONFIG")
             assert value is None
         except (FileNotFoundError, LookupError):
             assert True
-- 
1.8.3.1