diff --git a/Makefile b/Makefile index 00e2fb75ac0453abc42198b2f29ab9af8594af73..76c9b3b5195772e5d9b59a95bb5532fd2c2facee 100755 --- a/Makefile +++ b/Makefile @@ -10,11 +10,11 @@ # Create: 2020-04-01 NAME := oec-hardware -VERSION_PY := hwcert/version.py +VERSION_PY := hwcompatible/version.py .PHONY: all clean install -SUBDIRS := hwcert tests server scripts +SUBDIRS := hwcompatible tests server scripts all: $(VERSION_PY) for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR); done @@ -25,8 +25,8 @@ $(VERSION_PY): @echo "name = '$(NAME)'" >> $(VERSION_PY) install: - mkdir -p $(DESTDIR)/usr/share/eulercert - mkdir -p $(DESTDIR)/var/eulercert + mkdir -p $(DESTDIR)/usr/share/oech + mkdir -p $(DESTDIR)/var/oech for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) install; done clean: diff --git a/README.md b/README.md index d8e8b4775539b35d4112b34338706a45b8ab8270..2b1e2ff067d96aac8ef3249742a34e93f3c44965 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,8 @@ OS 厂商为了扩大自己产品的兼容性范围，常常寻求与硬件厂 ``` . -├── hwcert 框架主功能 -│ ├── certification.py 框架核心功能 +├── hwcompatible 框架主功能 +│ ├── compatibility.py 框架核心功能 │ ├── client.py 上传测试结果到服务端 │ ├── command.py bash命令执行封装 │ ├── commandUI.py 命令行交互工具 @@ -61,18 +61,18 @@ OS 厂商为了扩大自己产品的兼容性范围，常常寻求与硬件厂 │ ├── sysinfo.py 收集系统信息 │ └── test.py 测试套模板 ├── scripts 工具脚本 -│ ├── eulercert 框架命令行工具 -│ ├── eulercert-server.service 框架服务端 service 文件，用于启动 web 服务器 -│ ├── eulercert.service 框架客户端 service 文件，用于接管 reboot 用例 -│ └── kernelrelease.json 规范可用于认证的系统和内核版本 +│ ├── oech 框架命令行工具 +│ ├── oech-server.service 框架服务端 service 文件，用于启动 web 服务器 +│ ├── oech.service 框架客户端 service 文件，用于接管 reboot 用例 +│ └── kernelrelease.json 规范可用于认证的系统和内核版本 ├── server 服务端 -│ ├── eulercert-server-pre.sh 服务预执行脚本 -│ ├── results/ 测试结果存放目录 -│ ├── server.py 服务端主程序 -│ ├── static/ 图片存放目录 -│ ├── templates/ 网页模板存放目录 -│ ├── uwsgi.conf nginx 服务配置 -│ └── uwsgi.ini uwsgi 服务配置 +│ ├── oech-server-pre.sh 服务预执行脚本 +│ ├── results/ 测试结果存放目录 +│ ├── server.py 服务端主程序 +│ ├── static/ 图片存放目录 +│ ├── templates/ 网页模板存放目录 +│ ├── uwsgi.conf nginx 服务配置 +│ └── uwsgi.ini uwsgi 服务配置 └── tests 测试套 ``` @@ -156,7 +156,7 @@ OS 厂商为了扩大自己产品的兼容性范围，常常寻求与硬件厂 3. 启动服务。本服务默认使用 8080 端口，同时搭配 nginx（默认端口 80）提供 web 服务，请保证这些端口未被占用。 ``` - systemctl start eulercert-server.service + systemctl start oech-server.service systemctl start nginx.service ``` @@ -170,32 +170,32 @@ OS 厂商为了扩大自己产品的兼容性范围，常常寻求与硬件厂 ## 验证安装正确性 -客户端输入 `eulercert` 命令，可正常运行，则表示安装成功。如果安装有任何问题，可反馈至该邮箱：oecompatibility@openeuler.org 。 +客户端输入 `oech` 命令，可正常运行，则表示安装成功。如果安装有任何问题，可反馈至该邮箱：oecompatibility@openeuler.org 。 # 使用指导 ## 前提条件 -* `/usr/share/eulercert/kernelrelease.json`文件中列出了当前支持的所有系统版本，使用`uname -a` 命令确认当前系统内核版本是否属于框架支持的版本。 +* `/usr/share/oech/kernelrelease.json`文件中列出了当前支持的所有系统版本，使用`uname -a` 命令确认当前系统内核版本是否属于框架支持的版本。 * 框架默认会扫描所有网卡，对网卡进行测试前，请自行筛选被测网卡，并给它配上能`ping`通服务端的 ip ；如果是测试客户端 `InfiniBand`网卡，服务端也必须有一个 `InfiniBand`网卡并提前配好 ip 。 ## 使用步骤 -1. 在客户端启动测试框架。在客户端启动 `eulercert`，其中 `ID` 和 `URL` 可以按需填写，`Server` 必须填写为客户端可以直接访问的服务器域名或 ip，用于展示测试报告和作网络测试的服务端。 +1. 在客户端启动测试框架。在客户端启动 `oech`，其中 `ID` 和 `URL` 可以按需填写，`ID` 建议填写gitee上的issue ID，`Server` 必须填写为客户端可以直接访问的服务器域名或 ip，用于展示测试报告和作网络测试的服务端。 ``` - # eulercert - The openEuler Hardware Certification Test Suite - Please provide your Certification ID: + # oech + The openEuler Hardware Compatibility Test Suite + Please provide your Compatibility Test ID: Please provide your Product URL: - Please provide the Certification Server (Hostname or Ipaddr): + Please provide the Compatibility Test Server (Hostname or Ipaddr): ``` 2. 进入测试套选择界面。在用例选择界面，框架将自动扫描硬件并选取当前环境可供测试的测试套，输入 `edit` 可以进入测试套选择界面。 ``` - These tests are recommended to complete the certification: + These tests are recommended to complete the compatibility test: No. Run-Now? Status Class Device 1 yes NotRun acpi 2 yes NotRun clock @@ -243,7 +243,7 @@ OS 厂商为了扩大自己产品的兼容性范围，常常寻求与硬件厂 ------------- Summary ------------- ethernet-enp3s0 PASS system FAIL - Log saved to /usr/share/eulercert/logs/eulercert-20200228210118-TnvUJxFb50.tar succ. + Log saved to /usr/share/oech/logs/oech-20200228210118-TnvUJxFb50.tar succ. Do you want to submit last result? (y|n) y Uploading... Successfully uploaded result to server X.X.X.X. diff --git a/docs/result-qemu.png b/docs/result-qemu.png index 936f415120450d8ae0f14977f26f65a3ad606702..0396502322f78f095d924f300ad897e448fbb064 100644 Binary files a/docs/result-qemu.png and b/docs/result-qemu.png differ diff --git a/docs/results.png b/docs/results.png index 9b7a58b266e8a679b99fed534e89398879a7a56a..b339492095b3ff17cf6380ffaeb5aa1eb2a15344 100644 Binary files a/docs/results.png and b/docs/results.png differ diff --git a/hwcert/Makefile b/hwcompatible/Makefile similarity index 81% rename from hwcert/Makefile rename to hwcompatible/Makefile index 07b48eb4b91e1ded6a83074d549d20f629226de1..e4c18d9547afaeb004b5c17f9bee4ed4eefdb9d6 100755 --- a/hwcert/Makefile +++ b/hwcompatible/Makefile @@ -23,15 +23,15 @@ .PHONY: install clean -HWCERT_CLASS_LIB := /usr/share/eulercert/lib +HWCERT_CLASS_LIB := /usr/share/oech/lib all: ; install: - rm -rf $(DESTDIR)$(HWCERT_CLASS_LIB)/hwcert - mkdir -p $(DESTDIR)$(HWCERT_CLASS_LIB)/hwcert - cp -r ./*.py $(DESTDIR)$(HWCERT_CLASS_LIB)/hwcert/ + rm -rf $(DESTDIR)$(HWCERT_CLASS_LIB)/hwcompatible + mkdir -p $(DESTDIR)$(HWCERT_CLASS_LIB)/hwcompatible + cp -r ./*.py $(DESTDIR)$(HWCERT_CLASS_LIB)/hwcompatible/ clean: - rm -rf $(DESTDIR)$(HWCERT_CLASS_LIB)/hwcert + rm -rf $(DESTDIR)$(HWCERT_CLASS_LIB)/hwcompatible diff --git a/hwcert/__init__.py b/hwcompatible/__init__.py similarity index 100% rename from hwcert/__init__.py rename to hwcompatible/__init__.py diff --git a/hwcert/client.py b/hwcompatible/client.py similarity index 97% rename from hwcert/client.py rename to hwcompatible/client.py index 501ce55d665003f4461bd42c8a339215f7106b07..b4fdb5b4fa9c2d1005be203b6116d9fb9bf138dc 100755 --- a/hwcert/client.py +++ b/hwcompatible/client.py @@ -67,7 +67,7 @@ class Client: if __name__ == '__main__': - c = Client(' Taishan 2280', ' Certid-123523') + c = Client(' Taishan 2280', ' Testid-123523') import sys file = sys.argv[1] c.upload(file) diff --git a/hwcert/command.py b/hwcompatible/command.py similarity index 100% rename from hwcert/command.py rename to hwcompatible/command.py diff --git a/hwcert/commandUI.py b/hwcompatible/commandUI.py similarity index 100% rename from hwcert/commandUI.py rename to hwcompatible/commandUI.py diff --git a/hwcert/certification.py b/hwcompatible/compatibility.py similarity index 97% rename from hwcert/certification.py rename to hwcompatible/compatibility.py index 62400c0d6e56ade573a193160d87bc04860b82fc..fa6398708e706c516ba7a06bdc3c6f34ff24cd3c 100755 --- a/hwcert/certification.py +++ b/hwcompatible/compatibility.py @@ -39,7 +39,7 @@ class EulerCertification(): self.client = None def run(self): - print("The openEuler Hardware Certification Test Suite") + print("The openEuler Hardware Compatibility Test Suite") self.load() certdevice = CertDevice() @@ -81,7 +81,7 @@ class EulerCertification(): return False def clean(self): - if self.ui.prompt_confirm("Are you sure to clean all certification data?"): + if self.ui.prompt_confirm("Are you sure to clean all compatibility test data?"): try: Command("rm -rf %s" % CertEnv.certificationfile).run() Command("rm -rf %s" % CertEnv.factoryfile).run() @@ -107,7 +107,7 @@ class EulerCertification(): cert_id = self.certification.get_certify() hardware_info = self.certification.get_hardware() self.client = Client(hardware_info, cert_id) - print(" Certification ID: ".ljust(30) + cert_id) + print(" Compatibility Test ID: ".ljust(30) + cert_id) print(" Hardware Info: ".ljust(30) + hardware_info) print(" Product URL: ".ljust(30) + self.certification.get_url()) print(" OS Info: ".ljust(30) + self.certification.get_os()) @@ -126,7 +126,7 @@ class EulerCertification(): cwd = os.getcwd() os.chdir(os.path.dirname(doc_dir)) - dir_name = "eulercert-" + datetime.datetime.now().strftime("%Y%m%d%H%M%S") + "-" + job.job_id + dir_name = "oech-" + datetime.datetime.now().strftime("%Y%m%d%H%M%S") + "-" + job.job_id pack_name = dir_name +".tar" cmd = Command("tar -cf %s %s" % (pack_name, dir_name)) try: @@ -145,7 +145,7 @@ class EulerCertification(): def submit(self): packages = list() - pattern = re.compile("^eulercert-[0-9]{14}-[0-9a-zA-Z]{10}.tar$") + pattern = re.compile("^oech-[0-9]{14}-[0-9a-zA-Z]{10}.tar$") for (root, dirs, files) in os.walk(CertEnv.datadirectory): break packages.extend(filter(pattern.search, files)) @@ -358,7 +358,7 @@ class EulerCertification(): else: test["run"] = True os.system("clear") - print("These tests are recommended to complete the certification:") + print("These tests are recommended to complete the compatibility test:") self.show_tests() action = self.ui.prompt("Ready to begin testing?", ["run", "edit", "quit"]) action = action.lower() diff --git a/hwcert/device.py b/hwcompatible/device.py similarity index 100% rename from hwcert/device.py rename to hwcompatible/device.py diff --git a/hwcert/document.py b/hwcompatible/document.py similarity index 93% rename from hwcert/document.py rename to hwcompatible/document.py index 1ca4b48b29bd20e423c6169fff3a4301890175c3..f8725e6ee06f52c3b514ac84f3e17658ff33a9e3 100755 --- a/hwcert/document.py +++ b/hwcompatible/document.py @@ -79,17 +79,17 @@ class CertDocument(Document): print(e) sysinfo = SysInfo(CertEnv.releasefile) - self.document["eulerversion"] = sysinfo.product + " " + sysinfo.get_version() - self.document["kernelversion"] = sysinfo.kernel - self.document["certify"] = CommandUI().prompt("Please provide your Certification ID:") + self.document["OS"] = sysinfo.product + " " + sysinfo.get_version() + self.document["kernel"] = sysinfo.kernel + self.document["ID"] = CommandUI().prompt("Please provide your Compatibility Test ID:") self.document["Product URL"] = CommandUI().prompt("Please provide your Product URL:") - self.document["server"] = CommandUI().prompt("Please provide the Certification Server (Hostname or Ipaddr):") + self.document["server"] = CommandUI().prompt("Please provide the Compatibility Test Server (Hostname or Ipaddr):") def get_hardware(self): return self.document["Manufacturer"] + " " + self.document["Product Name"] + " " + self.document["Version"] def get_os(self): - return self.document["eulerversion"] + return self.document["OS"] def get_server(self): return self.document["server"] @@ -98,10 +98,10 @@ class CertDocument(Document): return self.document["Product URL"] def get_certify(self): - return self.document["certify"] + return self.document["ID"] def get_kernel(self): - return self.document["kernelversion"] + return self.document["kernel"] class DeviceDocument(Document): def __init__(self, filename, devices=list()): diff --git a/hwcert/env.py b/hwcompatible/env.py similarity index 68% rename from hwcert/env.py rename to hwcompatible/env.py index 130884ad507ee2063331ac3953fdd16192484875..9a6f1fa536a93e9563a56b13359fc26270eb3f1c 100755 --- a/hwcert/env.py +++ b/hwcompatible/env.py @@ -14,16 +14,16 @@ class CertEnv: - environmentfile = "/etc/eulercert.json" + environmentfile = "/etc/oech.json" releasefile = "/etc/os-release" - datadirectory = "/var/eulercert" - certificationfile = datadirectory + "/certification.json" + datadirectory = "/var/oech" + certificationfile = datadirectory + "/compatibility.json" devicefile = datadirectory + "/device.json" factoryfile = datadirectory + "/factory.json" rebootfile = datadirectory + "/reboot.json" - testdirectoy = "/usr/share/eulercert/lib/tests" - logdirectoy = "/usr/share/eulercert/logs" - resultdirectoy = "/usr/share/eulercert/lib/server/results" - kernelinfo = "/usr/share/eulercert/kernelrelease.json" + testdirectoy = "/usr/share/oech/lib/tests" + logdirectoy = "/usr/share/oech/logs" + resultdirectoy = "/usr/share/oech/lib/server/results" + kernelinfo = "/usr/share/oech/kernelrelease.json" diff --git a/hwcert/job.py b/hwcompatible/job.py similarity index 100% rename from hwcert/job.py rename to hwcompatible/job.py diff --git a/hwcert/log.py b/hwcompatible/log.py similarity index 96% rename from hwcert/log.py rename to hwcompatible/log.py index a28cccfcdd7619a19afaaa272231729e992c4b9d..cae0add773bf823475c2909631c897132cfcdfc5 100755 --- a/hwcert/log.py +++ b/hwcompatible/log.py @@ -21,7 +21,7 @@ from .env import CertEnv class Log(object): - def __init__(self, logname='eulercert.log', logdir='__temp__'): + def __init__(self, logname='oech.log', logdir='__temp__'): if not logdir: curtime = datetime.datetime.now().isoformat() logdir = os.path.join(CertEnv.logdirectoy, curtime) diff --git a/hwcert/reboot.py b/hwcompatible/reboot.py similarity index 94% rename from hwcert/reboot.py rename to hwcompatible/reboot.py index a30fad7a26b8cb187f126cd3debe27357ae5d99c..1cf0875bc2f6d15a7c43de83a42dc7f39567daac 100755 --- a/hwcert/reboot.py +++ b/hwcompatible/reboot.py @@ -36,7 +36,7 @@ class Reboot: test["reboot"] = False Command("rm -rf %s" % CertEnv.rebootfile).run(ignore_errors=True) - Command("systemctl disable eulercert").run(ignore_errors=True) + Command("systemctl disable oech").run(ignore_errors=True) def setup(self): if not (self.job and self.testname): @@ -62,9 +62,9 @@ class Reboot: try: Command("systemctl daemon-reload").run_quiet() - Command("systemctl enable eulercert").run_quiet() + Command("systemctl enable oech").run_quiet() except: - print("Error: enable eulercert.service fail.") + print("Error: enable oech.service fail.") return False return True diff --git a/hwcert/sysinfo.py b/hwcompatible/sysinfo.py similarity index 100% rename from hwcert/sysinfo.py rename to hwcompatible/sysinfo.py diff --git a/hwcert/test.py b/hwcompatible/test.py similarity index 100% rename from hwcert/test.py rename to hwcompatible/test.py diff --git a/oec-hardware.spec b/oec-hardware.spec index fcfbe0286a0cc4a4c3886c3f5b18e84e4215a070..00750f0b492b60f21dace23caa3cd7f5616921a4 100644 --- a/oec-hardware.spec +++ b/oec-hardware.spec @@ -5,7 +5,7 @@ %undefine __brp_mangle_shebangs Name: oec-hardware -Summary: openEuler Hardware Certification Test Suite +Summary: openEuler Hardware Compatibility Test Suite Version: %{version} Release: %{release} Group: Development/Tools @@ -22,15 +22,15 @@ Requires: python3 # server subpackage %package server -Summary: openEuler Hardware Certification Test Server +Summary: openEuler Hardware Compatibility Test Server Group: Development/Tools Requires: python3, python3-devel, nginx, qperf, psmisc %description -openEuler Hardware Certification Test Suite +openEuler Hardware Compatibility Test Suite %description server -openEuler Hardware Certification Test Server +openEuler Hardware Compatibility Test Server %prep %setup -q -c @@ -51,24 +51,24 @@ DESTDIR=$RPM_BUILD_ROOT make install %files %defattr(-,root,root) -/usr/bin/eulercert -/usr/share/eulercert/kernelrelease.json -/usr/share/eulercert/lib/hwcert -/usr/share/eulercert/lib/tests -/usr/lib/systemd/system/eulercert.service -%dir /var/eulercert -%dir /usr/share/eulercert/lib -%dir /usr/share/eulercert +/usr/bin/oech +/usr/share/oech/kernelrelease.json +/usr/share/oech/lib/hwcompatible +/usr/share/oech/lib/tests +/usr/lib/systemd/system/oech.service +%dir /var/oech +%dir /usr/share/oech/lib +%dir /usr/share/oech %files server %defattr(-,root,root) -/usr/share/eulercert/lib/server -/usr/share/eulercert/lib/server/uwsgi.ini -/usr/share/eulercert/lib/server/uwsgi.conf -/usr/lib/systemd/system/eulercert-server.service +/usr/share/oech/lib/server +/usr/share/oech/lib/server/uwsgi.ini +/usr/share/oech/lib/server/uwsgi.conf +/usr/lib/systemd/system/oech-server.service %postun -rm -rf /var/lock/eulercert.lock +rm -rf /var/lock/oech.lock %changelog * Fri Jul 26 2019 Lu Tianxiong - 1.0.0-h1 diff --git a/scripts/Makefile b/scripts/Makefile index 0ec28870911479e86d0e966579c0f9c809022f79..15a6fbedc8c7431818ac0a3a85736ed9dd8a34f0 100755 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -26,15 +26,15 @@ all: ; install: - rm -rf $(DESTDIR)/usr/bin/eulercert + rm -rf $(DESTDIR)/usr/bin/oech mkdir -p $(DESTDIR)/usr/bin - cp eulercert $(DESTDIR)/usr/bin - chmod u+x $(DESTDIR)/usr/bin/eulercert - mkdir -p $(DESTDIR)/usr/share/eulercert/lib - cp kernelrelease.json $(DESTDIR)/usr/share/eulercert/ + cp oech $(DESTDIR)/usr/bin + chmod u+x $(DESTDIR)/usr/bin/oech + mkdir -p $(DESTDIR)/usr/share/oech/lib + cp kernelrelease.json $(DESTDIR)/usr/share/oech/ mkdir -p $(DESTDIR)/usr/lib/systemd/system/ cp *.service $(DESTDIR)/usr/lib/systemd/system/ clean: - rm -rf $(DESTDIR)/usr/bin/eulercert + rm -rf $(DESTDIR)/usr/bin/oech diff --git a/scripts/eulercert-server.service b/scripts/eulercert-server.service deleted file mode 100644 index 025626929e485e56418c91127e4fc3f8603fc07a..0000000000000000000000000000000000000000 --- a/scripts/eulercert-server.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=openEuler Hardware Certification Server -After=network.target - -[Service] -Type=notify -ExecStartPre=/usr/share/eulercert/lib/server/eulercert-server-pre.sh -ExecStart=/usr/local/bin/uwsgi --ini /usr/share/eulercert/lib/server/uwsgi.ini - -[Install] -WantedBy=multi-user.target diff --git a/scripts/eulercert b/scripts/oech similarity index 83% rename from scripts/eulercert rename to scripts/oech index 2a9907bac6d74ba0857126ab5fc4e9f6681bf3cf..d6420c8cd90cd494722af6f627a998eabacaff3b 100644 --- a/scripts/eulercert +++ b/scripts/oech @@ -17,11 +17,11 @@ import sys import fcntl import argparse -sys.path.append("/usr/share/eulercert/lib/") -os.putenv("PYTHONPATH", "/usr/share/eulercert/lib/") +sys.path.append("/usr/share/oech/lib/") +os.putenv("PYTHONPATH", "/usr/share/oech/lib/") -from hwcert.certification import EulerCertification -import hwcert.version +from hwcompatible.compatibility import EulerCertification +import hwcompatible.version class CertLock: @@ -48,7 +48,7 @@ if __name__ == '__main__': sys.stderr.write("You need to be root to run this program.\n") sys.exit(1) - parser = argparse.ArgumentParser(description="Run openEuler Hardware Certification Test Suite") + parser = argparse.ArgumentParser(description="Run openEuler Hardware Compatibility Test Suite") parser.add_argument('--clean', action='store_true', help='Clean saved testsuite.') parser.add_argument('--rebootup', action='store_true', @@ -57,9 +57,9 @@ if __name__ == '__main__': help='Show testsuite version.') args = parser.parse_args() - lock = CertLock("/var/lock/eulercert.lock") + lock = CertLock("/var/lock/oech.lock") if not lock.acquire(): - sys.stderr.write("The eulercert may be running already, you should not run it repeated.\n") + sys.stderr.write("The oech may be running already, you should not run it repeated.\n") sys.exit(1) cert = EulerCertification() @@ -72,7 +72,7 @@ if __name__ == '__main__': lock.release() sys.exit(1) elif args.version: - print("version: %s" % hwcert.version.version) + print("version: %s" % hwcompatible.version.version) else: if not cert.run(): lock.release() diff --git a/scripts/oech-server.service b/scripts/oech-server.service new file mode 100644 index 0000000000000000000000000000000000000000..56c41e11d6649863488a67c08ee20dbee6e4ff73 --- /dev/null +++ b/scripts/oech-server.service @@ -0,0 +1,11 @@ +[Unit] +Description=openEuler Hardware Compatibility Test Server +After=network.target + +[Service] +Type=notify +ExecStartPre=/usr/share/oech/lib/server/oech-server-pre.sh +ExecStart=/usr/local/bin/uwsgi --ini /usr/share/oech/lib/server/uwsgi.ini + +[Install] +WantedBy=multi-user.target diff --git a/scripts/eulercert.service b/scripts/oech.service similarity index 62% rename from scripts/eulercert.service rename to scripts/oech.service index 271fcf2af6101e903cea807d680553f87932c67c..d2d0dec4592cc4b34781e4031b6536f910fadc19 100644 --- a/scripts/eulercert.service +++ b/scripts/oech.service @@ -1,11 +1,11 @@ [Unit] -Description=openEuler Hardware Certification Test Suite +Description=openEuler Hardware Compatibility Test Suite After=basic.target network.target DefaultDependencies=no [Service] Type=oneshot -ExecStart=/usr/bin/eulercert --rebootup +ExecStart=/usr/bin/oech --rebootup RemainAfterExit=yes TimeoutSec=0 diff --git a/server/Makefile b/server/Makefile index 34f33e11b3c6fea7dbbef795ed872568932b4414..58d330b87d38b37b068d8d8e2dbf048f75696a89 100755 --- a/server/Makefile +++ b/server/Makefile @@ -23,7 +23,7 @@ .PHONY: install clean -HWCERT_CLASS_LIB := /usr/share/eulercert/lib +HWCERT_CLASS_LIB := /usr/share/oech/lib all: ; diff --git a/server/eulercert-server-pre.sh b/server/oech-server-pre.sh similarity index 94% rename from server/eulercert-server-pre.sh rename to server/oech-server-pre.sh index ac46760d85c7405a5ec5fd46be06650cc9f409e9..220ae036db3e80b5f0bf79e2cdb8153d1d261a25 100755 --- a/server/eulercert-server-pre.sh +++ b/server/oech-server-pre.sh @@ -12,6 +12,6 @@ # Create: 2020-04-01 dir_nginx=/etc/nginx/default.d -dir_cert=/usr/share/eulercert/lib/server +dir_cert=/usr/share/oech/lib/server test -f ${dir_nginx}/uwsgi.conf || cp -af ${dir_cert}/uwsgi.conf ${dir_nginx} diff --git a/server/server.py b/server/server.py index 14fd6913c3af0c107e13ef998235ac73650c5f8a..a7b662adb7317e82cfdc0b5fad740effd0b71fee 100755 --- a/server/server.py +++ b/server/server.py @@ -74,7 +74,7 @@ def get_results(): @app.route('/results///') def get_job(host, id, job): dir_job = os.path.join(dir_results, host, id, job) - json_info = os.path.join(dir_job, 'certification.json') + json_info = os.path.join(dir_job, 'compatibility.json') json_results = os.path.join(dir_job, 'factory.json') try: with open(json_info, 'r') as f: @@ -142,7 +142,7 @@ def get_log(host, id, job, name): def submit(host, id, job): dir_job = os.path.join(dir_results, host, id, job) tar_job = dir_job + '.tar.gz' - json_cert = os.path.join(dir_job, 'certification.json') + json_cert = os.path.join(dir_job, 'compatibility.json') try: with open(json_cert, 'r') as f: cert = json.load(f) diff --git a/server/templates/base.html b/server/templates/base.html index 69bf04a20be168bab83fce72d49cbefe5a4aa94d..a46edd0c8c8f0ceff8882fff0e5c53cb54db2dea 100644 --- a/server/templates/base.html +++ b/server/templates/base.html @@ -1,7 +1,7 @@ {% extends "bootstrap/base.html" %} {% include "flash.html" %} -{% block title %}EulerCert{% endblock %} +{% block title %}OECH{% endblock %} {% block head %} {{ super() }} @@ -19,7 +19,7 @@ - EulerCert + OECH
    diff --git a/server/templates/device.html b/server/templates/device.html index 6aad43d6baff78ac18cff63e38dbe47a63671eb8..98939970f9b512bb89f8693ba422e8963026495e 100644 --- a/server/templates/device.html +++ b/server/templates/device.html @@ -1,10 +1,10 @@ {% extends "base.html" %} -{% block title %}EulerCert{% endblock %} +{% block title %}OECH{% endblock %} {% block page_content %}
    -

    openEuler Hardware Certification

    +

    openEuler Hardware Compatibility Test

    diff --git a/server/templates/devices.html b/server/templates/devices.html index 92d01717df740b92ece0097f6ded338946140180..d04ebcc635e910498627f4c6ffe24fcf955470f6 100644 --- a/server/templates/devices.html +++ b/server/templates/devices.html @@ -1,10 +1,10 @@ {% extends "base.html" %} -{% block title %}EulerCert{% endblock %} +{% block title %}OECH{% endblock %} {% block page_content %}
    -

    openEuler Hardware Certification

    +

    openEuler Hardware Compatibility Test

    {% for device in devices %}
    diff --git a/server/templates/error.html b/server/templates/error.html index aa4f593b3a62d885494dec14aed443688acc6a42..17c8d2b05be196ea90ec8b12c751797e1c6dab14 100644 --- a/server/templates/error.html +++ b/server/templates/error.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}EulerCert - {{ error }}{% endblock %} +{% block title %}OECH - {{ error }}{% endblock %} {% block page_content %}
    diff --git a/server/templates/files.html b/server/templates/files.html index eb436d399dc3e0b4e73032da0825d3a97fd39aa2..c87a593209a0720673df1f356f805ae0caca7a76 100644 --- a/server/templates/files.html +++ b/server/templates/files.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}EulerCert{% endblock %} +{% block title %}OECH{% endblock %} {% block page_content %}
    diff --git a/server/templates/index.html b/server/templates/index.html index 9e1f602a4eacd2ce7f6c2a03b60aa071015dca06..2001e7de97cfbc461acbed6c7d095a5511e949b3 100644 --- a/server/templates/index.html +++ b/server/templates/index.html @@ -1,10 +1,10 @@ {% extends "base.html" %} -{% block title %}EulerCert{% endblock %} +{% block title %}OECH{% endblock %} {% block page_content %}
    -

    EulerCert Test Server

    +

    Compatibility Test Server

    -

    Welcome to the openEuler Hardware Certification.

    +

    Welcome to the openEuler Hardware Compatibility Test.

    {% endblock %} diff --git a/server/templates/job.html b/server/templates/job.html index f9d5c5ebc4e4cab572527cbaab6bd78ec3ec627b..19566e7b2923f853ea9d75fa16c5d3485c00c1d2 100644 --- a/server/templates/job.html +++ b/server/templates/job.html @@ -1,10 +1,10 @@ {% extends "base.html" %} -{% block title %}EulerCert{% endblock %} +{% block title %}OECH{% endblock %} {% block page_content %}
    -

    openEuler Hardware Certification

    +

    openEuler Hardware Compatibility Test


    Submit Devices diff --git a/server/templates/log.html b/server/templates/log.html index d3263f57771157bcd4bdb8642ca7ba9cdea23835..50017242e0880a6d9dd68befee8350974f713b56 100644 --- a/server/templates/log.html +++ b/server/templates/log.html @@ -1,10 +1,10 @@ {% extends "base.html" %} -{% block title %}EulerCert{% endblock %} +{% block title %}OECH{% endblock %} {% block page_content %}
    -

    openEuler Hardware Certification

    +

    openEuler Hardware Compatibility Test

    {{ testcase }}

    {% for line in log %} diff --git a/server/templates/results.html b/server/templates/results.html index d9445cb354f47649259153194e70dc7fa8acc83a..d621eb46c83798f306e5487724d23a49cbb0b7fb 100644 --- a/server/templates/results.html +++ b/server/templates/results.html @@ -1,10 +1,10 @@ {% extends "base.html" %} -{% block title %}EulerCert{% endblock %} +{% block title %}OECH{% endblock %} {% block page_content %}
    -

    openEuler Hardware Certification

    +

    openEuler Hardware Compatibility Test

    @@ -27,7 +27,7 @@ {% endif %} {% do use_divider.append(1) %} -
  • Cert ID: {{ id }}
    • +
  • Test ID: {{ id }}
    • {% for job in job_list %}
  • {{ job }}
    • {% endfor %} diff --git a/server/templates/upload.html b/server/templates/upload.html index 04c92224fde852968d3e634636fffccc6f5711f8..a8e4e6742412766bfeca9615cdeeaaefd324ac5c 100644 --- a/server/templates/upload.html +++ b/server/templates/upload.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}EulerCert{% endblock %} +{% block title %}OECH{% endblock %} {% block page_content %}
    diff --git a/server/uwsgi.conf b/server/uwsgi.conf index 3717c5f6af0b91a8c1054370fc4bb37829b5f886..b1a7c559ec96507d9111ac95dafb6d95bcc09b2d 100644 --- a/server/uwsgi.conf +++ b/server/uwsgi.conf @@ -8,6 +8,6 @@ location ~ ^/ { uwsgi_pass 127.0.0.1:8080; uwsgi_param UWSGI_PYTHON /usr/bin/python3; - uwsgi_param UWSGI_CHDIR /usr/share/eulercert/lib/server; + uwsgi_param UWSGI_CHDIR /usr/share/oech/lib/server; uwsgi_param UWSGI_SCRIPT run:app; } diff --git a/server/uwsgi.ini b/server/uwsgi.ini index a4237298474d4b34eeeea39cb24bb68396528b03..4f74329dc8a2c5465550412cd250f1f2a9cbc2cd 100644 --- a/server/uwsgi.ini +++ b/server/uwsgi.ini @@ -1,6 +1,6 @@ [uwsgi] socket = 127.0.0.1:8080 -chdir = /usr/share/eulercert/lib/server +chdir = /usr/share/oech/lib/server wsgi-file = server.py callable = app processes = 4 diff --git a/tests/Makefile b/tests/Makefile index 471a9f95b3e3d9ed697c149df73d6508d811252f..403fc4b2185b020600b223a1df1d9f2109306cef 100755 --- a/tests/Makefile +++ b/tests/Makefile @@ -12,7 +12,7 @@ .PHONY: all clean install -HWCERT_TEST_LIB := $(DESTDIR)/usr/share/eulercert/lib/tests/ +HWCERT_TEST_LIB := $(DESTDIR)/usr/share/oech/lib/tests/ SUBDIRS := $(shell ls | grep -v Makefile) all: diff --git a/tests/acpi/acpi.py b/tests/acpi/acpi.py index 2953283979c6dcd2f105db46e502e8dd0511337d..10bacfbb634f09aa348f519a5ac29571458f703f 100755 --- a/tests/acpi/acpi.py +++ b/tests/acpi/acpi.py @@ -12,8 +12,8 @@ # See the Mulan PSL v2 for more details. # Create: 2020-04-01 -from hwcert.test import Test -from hwcert.command import Command +from hwcompatible.test import Test +from hwcompatible.command import Command class AcpiTest(Test): diff --git a/tests/cdrom/cdrom.py b/tests/cdrom/cdrom.py index e97b2dd288e7ad12a11cfb5fa074732c764d6803..dc104c784bdd289d0f74d0286ff71ae193a26be7 100755 --- a/tests/cdrom/cdrom.py +++ b/tests/cdrom/cdrom.py @@ -18,9 +18,9 @@ import time import shutil import argparse -from hwcert.test import Test -from hwcert.commandUI import CommandUI -from hwcert.command import Command, CertCommandError +from hwcompatible.test import Test +from hwcompatible.commandUI import CommandUI +from hwcompatible.command import Command, CertCommandError class CDRomTest(Test): diff --git a/tests/clock/clock.py b/tests/clock/clock.py index 45ad0aea3947f23b0ceb30796b75b8b498782eed..c91cf9dffbc4fd4c481c4e363e4656746249fab9 100755 --- a/tests/clock/clock.py +++ b/tests/clock/clock.py @@ -14,8 +14,8 @@ import os -from hwcert.test import Test -from hwcert.command import Command +from hwcompatible.test import Test +from hwcompatible.command import Command clock_dir = os.path.dirname(os.path.realpath(__file__)) diff --git a/tests/cpufreq/cpufreq.py b/tests/cpufreq/cpufreq.py index 923efd13ebe18593dba428930a4ef9a0db99c21e..832e943851f65aa873691c0a23e1b592a6f2ee5d 100755 --- a/tests/cpufreq/cpufreq.py +++ b/tests/cpufreq/cpufreq.py @@ -15,9 +15,9 @@ from random import randint from time import sleep -from hwcert.env import CertEnv -from hwcert.test import Test -from hwcert.command import Command +from hwcompatible.env import CertEnv +from hwcompatible.test import Test +from hwcompatible.command import Command class CPU: diff --git a/tests/disk/disk.py b/tests/disk/disk.py index 84579e58c3a6617c32cab595b191da0da3a89de3..6efd442c551f08aa16e3b62ce85390bfdf8a0ad8 100755 --- a/tests/disk/disk.py +++ b/tests/disk/disk.py @@ -18,10 +18,10 @@ import time import shutil import string -from hwcert.test import Test -from hwcert.command import Command, CertCommandError -from hwcert.commandUI import CommandUI -from hwcert.device import CertDevice, Device +from hwcompatible.test import Test +from hwcompatible.command import Command, CertCommandError +from hwcompatible.commandUI import CommandUI +from hwcompatible.device import CertDevice, Device class DiskTest(Test): diff --git a/tests/ipmi/ipmi.py b/tests/ipmi/ipmi.py index 9c94640f381dd8f16030c62d40951ac68dd4fb64..19be5d5e260f46067bd56ad860dea8f0d2b6ea4b 100755 --- a/tests/ipmi/ipmi.py +++ b/tests/ipmi/ipmi.py @@ -12,8 +12,8 @@ # See the Mulan PSL v2 for more details. # Create: 2020-04-01 -from hwcert.test import Test -from hwcert.command import Command +from hwcompatible.test import Test +from hwcompatible.command import Command class IpmiTest(Test): diff --git a/tests/kdump/kdump.py b/tests/kdump/kdump.py index 0d8ccd2f20e5a276ff1961a90c0909b2c45667eb..1bcc8a3df973077593bceddf761eef64fa00c329 100755 --- a/tests/kdump/kdump.py +++ b/tests/kdump/kdump.py @@ -16,10 +16,10 @@ import os import sys import time import re -from hwcert.test import Test -from hwcert.commandUI import CommandUI -from hwcert.document import ConfigFile -from hwcert.command import Command, CertCommandError +from hwcompatible.test import Test +from hwcompatible.commandUI import CommandUI +from hwcompatible.document import ConfigFile +from hwcompatible.command import Command, CertCommandError class KdumpTest(Test): diff --git a/tests/memory/memory.py b/tests/memory/memory.py index d936ab702bda60b2253ee52e549300ddfce8f308..66744a095deac9877e6bab27379121d78df6a3c8 100755 --- a/tests/memory/memory.py +++ b/tests/memory/memory.py @@ -17,8 +17,8 @@ import sys import time import re import string -from hwcert.test import Test -from hwcert.command import Command, CertCommandError +from hwcompatible.test import Test +from hwcompatible.command import Command, CertCommandError class MemoryTest(Test): diff --git a/tests/network/ethernet.py b/tests/network/ethernet.py index 6af59642a83348947c74a6f7ba97066c0116d4ea..7da0eedbd33498f3df3f8ba05a39cab6d824b305 100755 --- a/tests/network/ethernet.py +++ b/tests/network/ethernet.py @@ -15,10 +15,10 @@ import os import argparse -from hwcert.test import Test -from hwcert.command import Command -from hwcert.env import CertEnv -from hwcert.document import CertDocument +from hwcompatible.test import Test +from hwcompatible.command import Command +from hwcompatible.env import CertEnv +from hwcompatible.document import CertDocument from rdma import RDMATest @@ -69,7 +69,7 @@ if __name__ == '__main__': t = EthernetTest() t.server_ip = '199.1.1.2' - from hwcert.device import Device + from hwcompatible.device import Device properties = { 'DEVPATH': '/devices/pci0000:80/0000:80:01.0/0000:81:00.0/net/enp129s0f0', 'INTERFACE': 'enp129s0f0' diff --git a/tests/network/infiniband.py b/tests/network/infiniband.py index 44450205597669961c49a994d1d3db80ba03d863..7ab70215f91e3506eb5cc9f3d8d78b6b07e1e2b4 100755 --- a/tests/network/infiniband.py +++ b/tests/network/infiniband.py @@ -15,8 +15,8 @@ import os import argparse -from hwcert.test import Test -from hwcert.command import Command +from hwcompatible.test import Test +from hwcompatible.command import Command from rdma import RDMATest @@ -53,7 +53,7 @@ if __name__ == '__main__': t.server_ip = '199.1.37.20' t.speed = 10000 # Mb/s - from hwcert.device import Device + from hwcompatible.device import Device properties = { 'DEVPATH': '/devices/pci0000:d7/0000:d7:02.0/0000:d8:00.0/net/ib0', 'INTERFACE': 'ib0' diff --git a/tests/network/network.py b/tests/network/network.py index b95157ca1581eafdc08ddb9acd00af60751ebb79..6fd97c2a02f11c09814a6982020b5eab438237ef 100755 --- a/tests/network/network.py +++ b/tests/network/network.py @@ -25,10 +25,10 @@ except ImportError: from urllib import urlencode from urllib2 import urlopen, Request, HTTPError -from hwcert.test import Test -from hwcert.command import Command -from hwcert.document import CertDocument -from hwcert.env import CertEnv +from hwcompatible.test import Test +from hwcompatible.command import Command +from hwcompatible.document import CertDocument +from hwcompatible.env import CertEnv class NetworkTest(Test): @@ -377,7 +377,7 @@ if __name__ == '__main__': t = NetworkTest() t.server_ip = '9.82.37.2' - from hwcert.device import Device + from hwcompatible.device import Device properties = { 'DEVPATH': '/devices/pci0000:17/0000:17:00.0/0000:18:00.0/0000:19:03.0/0000:1a:00.2/net/eth_main', 'INTERFACE': 'eth_main' diff --git a/tests/network/rdma.py b/tests/network/rdma.py index 1404b228aa7c0765d2d66ebf9df133fc901d0508..f1ea71bc46fc6b8195c49eefe8d579e70112f1d2 100755 --- a/tests/network/rdma.py +++ b/tests/network/rdma.py @@ -16,10 +16,10 @@ import os import re import argparse -from hwcert.test import Test -from hwcert.command import Command -from hwcert.document import CertDocument -from hwcert.env import CertEnv +from hwcompatible.test import Test +from hwcompatible.command import Command +from hwcompatible.document import CertDocument +from hwcompatible.env import CertEnv from network import NetworkTest @@ -217,7 +217,7 @@ if __name__ == '__main__': t.server_ip = '199.1.37.20' t.speed = 10000 # Mb/s - from hwcert.device import Device + from hwcompatible.device import Device properties = { 'DEVPATH': '/devices/pci0000:d7/0000:d7:02.0/0000:d8:00.0/net/ib0', 'INTERFACE': 'ib0' diff --git a/tests/nvme/nvme.py b/tests/nvme/nvme.py index 28cffa455ebdb5bfedb134d6e7618b09382e12a1..d43b320107cf7031fc0911f3252e3e836c38700a 100755 --- a/tests/nvme/nvme.py +++ b/tests/nvme/nvme.py @@ -15,9 +15,9 @@ import os import sys import argparse -from hwcert.test import Test -from hwcert.command import Command -from hwcert.device import CertDevice, Device +from hwcompatible.test import Test +from hwcompatible.command import Command +from hwcompatible.device import CertDevice, Device class NvmeTest(Test): diff --git a/tests/perf/perf.py b/tests/perf/perf.py index 328b2e316c208d7ce9736259b7fa9913a8fa7cd5..76a6e3ad49b7f15622c2cbc1b7ebb2ee00ed1315 100755 --- a/tests/perf/perf.py +++ b/tests/perf/perf.py @@ -13,8 +13,8 @@ # Create: 2020-04-01 import re -from hwcert.test import Test -from hwcert.command import Command, CertCommandError +from hwcompatible.test import Test +from hwcompatible.command import Command, CertCommandError class PerfTest(Test): @@ -22,9 +22,9 @@ class PerfTest(Test): def __init__(self): Test.__init__(self) self.requirements = ["perf"] - self.perfRecord = "perf record -a -e cycles -o hwcert-perf.data sleep 5" - self.perfEvlist = "perf evlist -i hwcert-perf.data" - self.perfReport = "perf report -i hwcert-perf.data --stdio" + self.perfRecord = "perf record -a -e cycles -o hwcompatible-perf.data sleep 5" + self.perfEvlist = "perf evlist -i hwcompatible-perf.data" + self.perfReport = "perf report -i hwcompatible-perf.data --stdio" def exec_perf(self): # record diff --git a/tests/system/system.py b/tests/system/system.py index 529b547b6e3df58cae9ee75b57feb31f83877376..ec838203abed6d43632f12b73f466ea776028b2b 100755 --- a/tests/system/system.py +++ b/tests/system/system.py @@ -18,11 +18,11 @@ import re import shutil import argparse -from hwcert.test import Test -from hwcert.command import Command, CertCommandError -from hwcert.sysinfo import SysInfo -from hwcert.env import CertEnv -from hwcert.document import Document +from hwcompatible.test import Test +from hwcompatible.command import Command, CertCommandError +from hwcompatible.sysinfo import SysInfo +from hwcompatible.env import CertEnv +from hwcompatible.document import Document class SystemTest(Test): diff --git a/tests/tape/tape.py b/tests/tape/tape.py index 34ac3d48af514ef79854e1d0dd684a56b0959a23..16ab96b6fa0e254df67033e5f5ded2627e6476b7 100755 --- a/tests/tape/tape.py +++ b/tests/tape/tape.py @@ -14,9 +14,9 @@ import argparse -from hwcert.test import Test -from hwcert.command import Command, CertCommandError -from hwcert.device import CertDevice, Device +from hwcompatible.test import Test +from hwcompatible.command import Command, CertCommandError +from hwcompatible.device import CertDevice, Device class TapeTest(Test): diff --git a/tests/usb/usb.py b/tests/usb/usb.py index cad518360dda84cf0cc0afd60632e95d216970a0..4f51938bfe4739dfdc68a98a7064c9764d648627 100755 --- a/tests/usb/usb.py +++ b/tests/usb/usb.py @@ -16,10 +16,10 @@ import os import sys import time -from hwcert.test import Test -from hwcert.commandUI import CommandUI -from hwcert.command import Command, CertCommandError -from hwcert.device import CertDevice, Device +from hwcompatible.test import Test +from hwcompatible.commandUI import CommandUI +from hwcompatible.command import Command, CertCommandError +from hwcompatible.device import CertDevice, Device class UsbTest(Test): diff --git a/tests/watchdog/watchdog.py b/tests/watchdog/watchdog.py index 71bff4c3673305b07b20d347b79410537f9b5508..be1eb8a8e587d6eb73a2ff6c34fb34b4a0f8f54f 100755 --- a/tests/watchdog/watchdog.py +++ b/tests/watchdog/watchdog.py @@ -17,9 +17,9 @@ import sys import time import re -from hwcert.test import Test -from hwcert.commandUI import CommandUI -from hwcert.command import Command, CertCommandError +from hwcompatible.test import Test +from hwcompatible.commandUI import CommandUI +from hwcompatible.command import Command, CertCommandError class WatchDogTest(Test):