From 2111c2e5d6d50cd7c537f0513428bdce4acaea40 Mon Sep 17 00:00:00 2001 From: theprocess Date: Wed, 27 May 2020 20:29:31 +0800 Subject: [PATCH] modify tools name --- Makefile | 4 +-- README.md | 30 +++++++++---------- hwcert/Makefile | 2 +- hwcert/certification.py | 12 ++++---- hwcert/document.py | 14 ++++----- hwcert/env.py | 12 ++++---- hwcert/log.py | 2 +- hwcert/reboot.py | 6 ++-- oec-hardware.spec | 26 ++++++++-------- scripts/Makefile | 12 ++++---- scripts/eulercert-server.service | 11 ------- scripts/{eulercert => oech} | 10 +++---- scripts/oech-server.service | 11 +++++++ scripts/{eulercert.service => oech.service} | 2 +- server/Makefile | 2 +- ...rcert-server-pre.sh => oech-server-pre.sh} | 2 +- server/templates/base.html | 4 +-- server/templates/device.html | 4 +-- server/templates/devices.html | 4 +-- server/templates/error.html | 2 +- server/templates/files.html | 2 +- server/templates/index.html | 6 ++-- server/templates/job.html | 4 +-- server/templates/log.html | 4 +-- server/templates/results.html | 4 +-- server/templates/upload.html | 2 +- server/uwsgi.conf | 2 +- server/uwsgi.ini | 2 +- tests/Makefile | 2 +- 29 files changed, 100 insertions(+), 100 deletions(-) delete mode 100644 scripts/eulercert-server.service rename scripts/{eulercert => oech} (88%) create mode 100644 scripts/oech-server.service rename scripts/{eulercert.service => oech.service} (84%) rename server/{eulercert-server-pre.sh => oech-server-pre.sh} (94%) diff --git a/Makefile b/Makefile index 00e2fb7..dc98d1f 100755 --- a/Makefile +++ b/Makefile @@ -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 d83a667..f8c7fb0 100644 --- a/README.md +++ b/README.md @@ -61,18 +61,18 @@ OS 厂商为了扩大自己产品的兼容性范围,常常寻求与硬件厂 │ ├── sysinfo.py 收集系统信息 │ └── test.py 测试套模板 ├── scripts 工具脚本 -│ ├── oech 框架命令行工具 -│ ├── 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,13 +170,13 @@ 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 。 @@ -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/hwcert/Makefile b/hwcert/Makefile index 07b48eb..6c5a356 100755 --- a/hwcert/Makefile +++ b/hwcert/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/hwcert/certification.py b/hwcert/certification.py index 62400c0..fa63987 100755 --- a/hwcert/certification.py +++ b/hwcert/certification.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/document.py b/hwcert/document.py index 1ca4b48..3e2a6af 100755 --- a/hwcert/document.py +++ b/hwcert/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["tester"] = 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["tester"] 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/hwcert/env.py index 130884a..5eb0217 100755 --- a/hwcert/env.py +++ b/hwcert/env.py @@ -14,16 +14,16 @@ class CertEnv: - environmentfile = "/etc/eulercert.json" + environmentfile = "/etc/oech.json" releasefile = "/etc/os-release" - datadirectory = "/var/eulercert" + datadirectory = "/var/oech" certificationfile = datadirectory + "/certification.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/log.py b/hwcert/log.py index a28cccf..cae0add 100755 --- a/hwcert/log.py +++ b/hwcert/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/hwcert/reboot.py index a30fad7..1cf0875 100755 --- a/hwcert/reboot.py +++ b/hwcert/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/oec-hardware.spec b/oec-hardware.spec index fcfbe02..c8c30a2 100644 --- a/oec-hardware.spec +++ b/oec-hardware.spec @@ -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/hwcert +/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 0ec2887..15a6fbe 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 0256269..0000000 --- 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 88% rename from scripts/eulercert rename to scripts/oech index 2a9907b..ea2c4d9 100644 --- a/scripts/eulercert +++ b/scripts/oech @@ -17,8 +17,8 @@ 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 @@ -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() diff --git a/scripts/oech-server.service b/scripts/oech-server.service new file mode 100644 index 0000000..6216ee2 --- /dev/null +++ b/scripts/oech-server.service @@ -0,0 +1,11 @@ +[Unit] +Description=openEuler Hardware Certification 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 84% rename from scripts/eulercert.service rename to scripts/oech.service index 271fcf2..3fa69b5 100644 --- a/scripts/eulercert.service +++ b/scripts/oech.service @@ -5,7 +5,7 @@ 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 34f33e1..58d330b 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 ac46760..220ae03 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/templates/base.html b/server/templates/base.html index 69bf04a..f2721a8 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