From 1c2d2d54d2947e4bde2d609624d0b59d5607a568 Mon Sep 17 00:00:00 2001 From: qz_cx Date: Sat, 11 Oct 2025 15:03:16 +0800 Subject: [PATCH] Add page testing for YAML using form format --- appStore/testCase/models.py | 2 +- appStore/utils/common.py | 5 +- appStore/utils/xlsx_to_json.py | 32 +- templates/front-project/src/App.vue | 13 +- .../src/components/KytuningHome.vue | 3 +- templates/front-project/src/router/index.js | 1 - .../src/views/dataViews/StoreTable.vue | 6 +- .../src/views/dataViews/UnxibenchTable.vue | 1 - .../src/views/testViews/DoTest-yaml.vue | 507 ++++++++++++++++++ 9 files changed, 554 insertions(+), 16 deletions(-) create mode 100644 templates/front-project/src/views/testViews/DoTest-yaml.vue diff --git a/appStore/testCase/models.py b/appStore/testCase/models.py index 80c476a..3d9bb6a 100644 --- a/appStore/testCase/models.py +++ b/appStore/testCase/models.py @@ -26,7 +26,7 @@ class TestCase(models.Model): cpu2006 = models.IntegerField(default=0, verbose_name='几组cpu2006数据') cpu2017 = models.IntegerField(default=0, verbose_name='几组cpu2017数据') user_name = models.CharField(max_length=255, verbose_name='测试人员') - test_result = models.CharField(max_length=255, verbose_name='测试结果反馈', null=True, blank=True) # 如果有多项也是拼接 + test_result = models.CharField(max_length=500, verbose_name='测试结果反馈', null=True, blank=True) # 如果有多项也是拼接 result_log_name = models.CharField(max_length=255, verbose_name='日志文件路径的base部分') is_error = models.BooleanField(default=False,verbose_name="是否是错误列表所需要的") diff --git a/appStore/utils/common.py b/appStore/utils/common.py index 315eb65..d124a59 100644 --- a/appStore/utils/common.py +++ b/appStore/utils/common.py @@ -122,11 +122,14 @@ def test_case(test_ip, test_username, test_password, test_case_names, user_confi :param run_kytuning_temp: run_kytuning存放的临时文件 :return: """ + + mv_ssh_keygen = "ssh-keygen -R " + test_ip + subprocess.run(mv_ssh_keygen, shell=True) # 下载run_kytuning代码 wget_command = f'sshpass -p {test_password} ssh -o StrictHostKeyChecking=no {test_username}@{test_ip} "rm -rf /root/run_kytuning-ffdev/;wget -O /root/run_kytuning-ffdev.zip http://localhost:9000/tools/run_kytuning-ffdev.zip;unzip /root/run_kytuning-ffdev.zip -d /root/;rm -rf /root/run_kytuning-ffdev/conf/user.cfg;rm -rf /root/run_kytuning-ffdev/yaml-base/"' wget_result = subprocess.run(wget_command, shell=True) if wget_result.returncode: - wget_result.stderr = "测试端下载run_kytuning代码出错,请检查账号、密码是否正确,网络是否可用" + wget_result.stderr = "测试端下载run_kytuning代码出错,请检查账号、密码是否正确,网络是否可用\n请在其它机器中测试:" + wget_command return wget_result # # 复制配置文件conf文件和yaml文件 diff --git a/appStore/utils/xlsx_to_json.py b/appStore/utils/xlsx_to_json.py index f303aba..89933d0 100644 --- a/appStore/utils/xlsx_to_json.py +++ b/appStore/utils/xlsx_to_json.py @@ -16,6 +16,8 @@ import base64 import json import math import time + +import numpy import pandas as pd user_data = { @@ -90,12 +92,30 @@ def env_excel_to_json(file_path, sheet_name,disk_number,nic_number): swinfo_os_osversion = column_data[new_number + 3] swinfo_os_kernel = column_data[new_number + 4] swinfo_os_grub = column_data[new_number + 5] - swinfo_runtime_sysconf = str(base64.b64encode(column_data[new_number + 6].encode("ascii")))[2:-1] - swinfo_runtime_sysctl = str(base64.b64encode(column_data[new_number + 7].encode("ascii")))[2:-1] - swinfo_runtime_systemctlinfo = str(base64.b64encode(column_data[new_number + 8].encode("ascii")))[2:-1] - swinfo_runtime_driverinfo = str(base64.b64encode(column_data[new_number + 9].encode("ascii")))[2:-1] - swinfo_runtime_rpmlist = str(base64.b64encode(column_data[new_number + 10].encode("ascii")))[2:-1] - swinfo_runtime_ipclist = str(base64.b64encode(column_data[new_number + 11].encode("ascii")))[2:-1] + if column_data[new_number + 6] == numpy.nan: + swinfo_runtime_sysconf = str(base64.b64encode(column_data[new_number + 6].encode("ascii")))[2:-1] + else: + swinfo_runtime_sysconf = '' + if column_data[new_number + 7] == numpy.nan: + swinfo_runtime_sysctl = str(base64.b64encode(column_data[new_number + 7].encode("ascii")))[2:-1] + else: + swinfo_runtime_sysctl = '' + if column_data[new_number + 8] == numpy.nan: + swinfo_runtime_systemctlinfo = str(base64.b64encode(column_data[new_number + 8].encode("ascii")))[2:-1] + else: + swinfo_runtime_systemctlinfo = '' + if column_data[new_number + 9]== numpy.nan: + swinfo_runtime_driverinfo = str(base64.b64encode(column_data[new_number + 9].encode("ascii")))[2:-1] + else: + swinfo_runtime_driverinfo = '' + if column_data[new_number + 10]== numpy.nan: + swinfo_runtime_rpmlist = str(base64.b64encode(column_data[new_number + 10].encode("ascii")))[2:-1] + else: + swinfo_runtime_rpmlist = '' + if column_data[new_number + 11]== numpy.nan: + swinfo_runtime_ipclist = str(base64.b64encode(column_data[new_number + 11].encode("ascii")))[2:-1] + else: + swinfo_runtime_ipclist = '' except: print("请确认磁盘和网卡数量") diff --git a/templates/front-project/src/App.vue b/templates/front-project/src/App.vue index cc8f815..80d8dc1 100644 --- a/templates/front-project/src/App.vue +++ b/templates/front-project/src/App.vue @@ -17,10 +17,19 @@ export default { diff --git a/templates/front-project/src/components/KytuningHome.vue b/templates/front-project/src/components/KytuningHome.vue index 428ae7c..f308764 100644 --- a/templates/front-project/src/components/KytuningHome.vue +++ b/templates/front-project/src/components/KytuningHome.vue @@ -36,9 +36,10 @@ export default { -- Gitee