2022 lines
169 KiB
Diff
2022 lines
169 KiB
Diff
diff -Naur a/config/test_config.yaml b/config/test_config.yaml
|
||
--- a/config/test_config.yaml 2022-09-21 14:21:00.528533970 +0800
|
||
+++ b/config/test_config.yaml 2022-09-21 14:14:27.680533970 +0800
|
||
@@ -2,8 +2,8 @@
|
||
# needs to be enclosed in single quotation marks
|
||
#disk: fc\raid\disk testcase need configuration, The disk to be tested, such as sda; Or all, test all qualified disks.
|
||
#if_rdma: ethernet testcase need configuration, N means to test according to ordinary network card, y means to test according to RDMA card
|
||
-#server_ip: ethernet\infiniband testcase need configuration, If the server port is modified, you need to add the port number after the IP address
|
||
-
|
||
+#server_ip: ethernet\infiniband testcase need configuration. If the server port is modified, need to add the port number after the IP address. eg: 2.2.2.4:8090.
|
||
+#clent_ip: ethernet\infiniband testcase need configuration. IP to be configured for the client port
|
||
fc:
|
||
fc1:
|
||
device: '0000:03:00.0'
|
||
@@ -20,20 +20,39 @@
|
||
disk: sdb
|
||
disk: all
|
||
ethernet:
|
||
+ # IP has been manually configured, get server IP.
|
||
eth1:
|
||
device: enp125s0f0
|
||
if_rdma: N
|
||
- server_ip: 127.0.0.1
|
||
+ client_ip:
|
||
+ server_ip: 2.2.2.4
|
||
+ # Configure the IP obtained here.
|
||
eth2:
|
||
device: enp125s0f1
|
||
if_rdma: N
|
||
- server_ip: 127.0.0.1:8090
|
||
+ client_ip: 2.2.2.3
|
||
+ server_ip: 2.2.2.4
|
||
+ # The program automatically generates an IP address for IP configuration
|
||
+ eth3:
|
||
+ device: enp125s0f2
|
||
+ if_rdma: y
|
||
+ client_ip:
|
||
+ server_ip:
|
||
infiniband:
|
||
+ # IP has been manually configured, get server IP.
|
||
ib1:
|
||
device: ibp1s0
|
||
- server_ip: 127.0.0.1
|
||
+ client_ip:
|
||
+ server_ip: 2.2.2.4
|
||
+ # Configure the IP obtained here.
|
||
ib2:
|
||
device: ibp1s0
|
||
- server_ip: 127.0.0.1:8090
|
||
+ client_ip: 2.2.2.3
|
||
+ server_ip: 2.2.2.4:8090
|
||
+ # The program automatically generates an IP address for IP configuration
|
||
+ ib3:
|
||
+ device: ibp1s0
|
||
+ client_ip:
|
||
+ server_ip:
|
||
|
||
|
||
diff -Naur a/docs/design_docs/dev_design.md b/docs/design_docs/dev_design.md
|
||
--- a/docs/design_docs/dev_design.md 2022-09-21 14:21:00.532533970 +0800
|
||
+++ b/docs/design_docs/dev_design.md 2022-09-21 14:14:27.684533970 +0800
|
||
@@ -29,9 +29,8 @@
|
||
| tar | 打包、解压测试日志 | 可使用 `dnf/yum` 进行安装 |
|
||
| qperf | 用于服务端网络自测 | 可使用 `dnf/yum` 进行安装 |
|
||
| psmisc | 提供进程管理服务 | 可使用 `dnf/yum` 进行安装 |
|
||
-| Flask | 提供web访问的http协议的框架,v2.1.2 及以上版本 | 可使用 `pip3` 进行安装 |
|
||
-| Flask-bootstrap | 提供Web页面美化,v3.3.4.1 及以上版本 | 可使用 `pip3` 进行安装 |
|
||
-| uwsgi | 提供wsgi协议的服务器,v2.0.20 及以上版本 | 可使用 `pip3` 进行安装 |
|
||
+| python3-flask | 提供web访问的http协议的框架 | 可使用 `dnf/yum` 进行安装 |
|
||
+| python3-uWSGI | 提供wsgi协议的服务器 | 可使用 `dnf/yum` 进行安装 |
|
||
|
||
#### 1.2.3 客户端测试项依赖组件
|
||
|
||
@@ -39,8 +38,8 @@
|
||
| --------- | ------ | --------- |
|
||
| acpi | acpica-tools | acpi 测试 |
|
||
| cdrom | dvd+rw-tools | cd/dvd 测试 |
|
||
+| | cdrkit | |
|
||
| | genisoimage | |
|
||
-| | wodim | |
|
||
| | util-linux | |
|
||
| disk/fc/raid | fio | 硬盘读写测试 |
|
||
| gpu | git | gpu 测试,获取开源项目 gpu_burn/cuda_samples |
|
||
@@ -65,11 +64,12 @@
|
||
| nvme | nvme-cli | nvme 测试 |
|
||
| perf | perf | perf测试 |
|
||
| usb | usbutils | usb 测试 |
|
||
-| vgpu | qemu | vgpu测试 |
|
||
+| vgpu | qemu | vgpu 测试 |
|
||
| | libvirt | |
|
||
| | xz | |
|
||
| | util-linux | |
|
||
| | expect | |
|
||
+| system | policycoreutils | system 测试 |
|
||
|
||
### 1.3 License
|
||
|
||
@@ -115,7 +115,7 @@
|
||
│ ├── oech-server-pre.sh 服务预执行脚本
|
||
│ ├── results/ 测试结果存放目录
|
||
│ ├── server.py 服务端主程序
|
||
-│ ├── static/ 图片存放目录
|
||
+│ ├── static/ 网页图片、样式设计文件存放目录
|
||
│ ├── templates/ 网页模板存放目录
|
||
│ ├── uwsgi.conf nginx 服务配置
|
||
│ └── uwsgi.ini uwsgi 服务配置
|
||
@@ -189,6 +189,8 @@
|
||
|
||
停止 oech 服务:`systemctl stop oech.service`
|
||
|
||
+ 重启 oech 服务:`systemctl restart oech.service`
|
||
+
|
||
* 服务端
|
||
|
||
启动 oech-server 服务:`systemctl start oech-server.service`
|
||
@@ -197,6 +199,8 @@
|
||
|
||
停止 oech-server 服务:`systemctl stop oech-server.service`
|
||
|
||
+ 重启 oech-server 服务:`systemctl restart oech-server.service`
|
||
+
|
||
#### 3.4.3 配置文件
|
||
|
||
##### 3.4.3.1 版本配置文件
|
||
diff -Naur a/docs/design_docs/oech_rpm_version_design.md b/docs/design_docs/oech_rpm_version_design.md
|
||
--- a/docs/design_docs/oech_rpm_version_design.md 2022-09-21 14:21:00.532533970 +0800
|
||
+++ b/docs/design_docs/oech_rpm_version_design.md 2022-09-21 14:14:27.684533970 +0800
|
||
@@ -18,7 +18,7 @@
|
||
|
||
2.1 openEuler/oec-hardware
|
||
|
||
- 源码仓库里的版本号通过 Version 进行管理。在新增功能特性后,工具的版本号+1,并在SPEC中增加 changelog 说明,Version 演讲说明如下:
|
||
+ 源码仓库里的版本号通过 Version 进行管理。在新增功能特性后,工具的版本号+1,并在SPEC中增加 changelog 说明,Version 演进说明如下:
|
||
|
||
Version: X.Y.Z
|
||
|
||
diff -Naur a/docs/pictures/result-qemu.png b/docs/pictures/result-qemu.png
|
||
--- a/docs/pictures/result-qemu.png 2022-09-21 14:21:00.532533970 +0800
|
||
+++ b/docs/pictures/result-qemu.png 2022-09-21 14:14:27.684533970 +0800
|
||
@@ -1,24 +1,43 @@
|
||
<20>PNG
|
||
|
||
- |