Skip to content

O
oec-hardware

openeuler / oec-hardware

通知 4
Star 0
Fork 0
O
oec-hardware

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 837e6488 编写于 作者: C cuixucui
浏览文件
操作

编码规范整改

上级 deed7420
隐藏空白更改
内联 并排
Showing with 425 addition and 28 deletion
.idea/misc.xml 0 → 100644
浏览文件 @ 837e6488
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (2)" project-jdk-type="Python SDK" />
<component name="PyCharmProfessionalAdvertiser">
<option name="shown" value="true" />
</component>
</project>
\ No newline at end of file
.idea/modules.xml 0 → 100644
浏览文件 @ 837e6488
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/oec-hardware.iml" filepath="$PROJECT_DIR$/.idea/oec-hardware.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/oec-hardware.iml 0 → 100644
浏览文件 @ 837e6488
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TestRunnerService">
<option name="projectConfiguration" value="pytest" />
<option name="PROJECT_TEST_RUNNER" value="pytest" />
</component>
</module>
\ No newline at end of file
.idea/vcs.xml 0 → 100644
浏览文件 @ 837e6488
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
.idea/workspace.xml 0 → 100644
浏览文件 @ 837e6488
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="5f681658-0865-4c20-b343-72e088b11842" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/hwcompatible/compatibility.py" beforeDir="false" afterPath="$PROJECT_DIR$/hwcompatible/compatibility.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/server/server.py" beforeDir="false" afterPath="$PROJECT_DIR$/server/server.py" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tests/network/ethernet.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1215">
<caret line="51" column="38" selection-start-line="51" selection-start-column="38" selection-end-line="51" selection-end-column="38" />
<folding>
<element signature="e#587#596#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tests/network/network.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tests/network/rdma.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="23" selection-start-line="23" selection-end-line="23" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tests/system/system.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3645">
<caret line="145" column="31" selection-start-line="145" selection-start-column="31" selection-end-line="145" selection-end-column="31" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/server/templates/job.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="567">
<caret line="21" column="20" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/hwcompatible/compatibility.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="282">
<caret line="172" column="51" selection-start-line="172" selection-start-column="51" selection-end-line="172" selection-end-column="51" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/server/server.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="498">
<caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tests/nvme/nvme.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tests/ipmi/ipmi.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="999">
<caret line="38" column="35" selection-start-line="38" selection-start-column="19" selection-end-line="38" selection-end-column="35" />
<folding>
<element signature="e#587#621#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/hwcompatible/command.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5454">
<caret line="204" column="27" selection-start-line="204" selection-start-column="27" selection-end-line="204" selection-end-column="27" />
<folding>
<element signature="e#587#597#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>CertCommandError</find>
<find>cert_id</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/hwcompatible/command.py" />
<option value="$PROJECT_DIR$/tests/acpi/acpi.py" />
<option value="$PROJECT_DIR$/tests/cdrom/cdrom.py" />
<option value="$PROJECT_DIR$/tests/ipmi/ipmi.py" />
<option value="$PROJECT_DIR$/tests/disk/disk.py" />
<option value="$PROJECT_DIR$/tests/memory/memory.py" />
<option value="$PROJECT_DIR$/tests/kdump/kdump.py" />
<option value="$PROJECT_DIR$/tests/network/ethernet.py" />
<option value="$PROJECT_DIR$/tests/system/system.py" />
<option value="$PROJECT_DIR$/hwcompatible/compatibility.py" />
<option value="$PROJECT_DIR$/server/server.py" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="798" />
<option name="y" value="411" />
<option name="width" value="1509" />
<option name="height" value="905" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="oec-hardware" type="b2602c69:ProjectViewProjectNode" />
<item name="oec-hardware" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="oec-hardware" type="b2602c69:ProjectViewProjectNode" />
<item name="oec-hardware" type="462c0819:PsiDirectoryNode" />
<item name="server" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="oec-hardware" type="b2602c69:ProjectViewProjectNode" />
<item name="oec-hardware" type="462c0819:PsiDirectoryNode" />
<item name="server" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="5f681658-0865-4c20-b343-72e088b11842" name="Default Changelist" comment="" />
<created>1592261845556</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1592261845556</updated>
</task>
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24973656" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="bottom" id="Terminal" order="8" />
<window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
<window_info anchor="bottom" id="Python Console" order="10" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
</layout>
</component>
<component name="editorHistoryManager">
<entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/json/decoder.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="290">
<caret line="19" column="6" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/subprocess.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="282">
<caret line="802" column="8" selection-start-line="802" selection-start-column="8" selection-end-line="802" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tests/acpi/acpi.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="524">
<caret line="26" column="34" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/.PyCharmCE2019.1/system/python_stubs/-1442388730/builtins.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="290">
<caret line="5448" column="6" selection-start-line="5448" selection-start-column="6" selection-end-line="5448" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tests/cdrom/cdrom.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="218">
<caret line="16" column="11" lean-forward="true" selection-start-line="16" selection-start-column="11" selection-end-line="16" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tests/cpufreq/cpufreq.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="339" column="17" selection-start-line="339" selection-start-column="17" selection-end-line="339" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tests/disk/disk.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="188" column="32" selection-start-line="188" selection-start-column="28" selection-end-line="188" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tests/memory/memory.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6426">
<caret line="244" column="26" selection-start-line="244" selection-start-column="19" selection-end-line="244" selection-end-column="35" />
<folding>
<element signature="e#587#596#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tests/kdump/kdump.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1944">
<caret line="79" column="59" selection-start-line="79" selection-start-column="59" selection-end-line="79" selection-end-column="59" />
<folding>
<element signature="e#587#596#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tests/network/ethernet.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1215">
<caret line="51" column="38" selection-start-line="51" selection-start-column="38" selection-end-line="51" selection-end-column="38" />
<folding>
<element signature="e#587#596#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tests/network/network.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/tests/network/rdma.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="23" selection-start-line="23" selection-end-line="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tests/system/system.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3645">
<caret line="145" column="31" selection-start-line="145" selection-start-column="31" selection-end-line="145" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tests/nvme/nvme.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/tests/ipmi/ipmi.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="999">
<caret line="38" column="35" selection-start-line="38" selection-start-column="19" selection-end-line="38" selection-end-column="35" />
<folding>
<element signature="e#587#621#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/hwcompatible/command.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5454">
<caret line="204" column="27" selection-start-line="204" selection-start-column="27" selection-end-line="204" selection-end-column="27" />
<folding>
<element signature="e#587#597#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/server/templates/job.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="567">
<caret line="21" column="20" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/hwcompatible/compatibility.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="282">
<caret line="172" column="51" selection-start-line="172" selection-start-column="51" selection-end-line="172" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/server/server.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="498">
<caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
hwcompatible/compatibility.py
浏览文件 @ 837e6488
......@@ -104,10 +104,10 @@ class EulerCertification():
factory_doc = FactoryDocument(CertEnv.factoryfile)
self.test_factory = factory_doc.get_factory()
cert_id = self.certification.get_certify()
oec_id = self.certification.get_certify()
hardware_info = self.certification.get_hardware()
self.client = Client(hardware_info, cert_id)
print(" Compatibility Test ID: ".ljust(30) + cert_id)
self.client = Client(hardware_info, oec_id)
print(" Compatibility Test ID: ".ljust(30) + oec_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())
......@@ -168,9 +168,9 @@ class EulerCertification():
def upload(self, path, server):
print("Uploading...")
if not self.client:
cert_id = self.certification.get_certify()
oec_id = self.certification.get_certify()
hardware_info = self.certification.get_hardware()
self.client = Client(hardware_info, cert_id)
self.client = Client(hardware_info, oec_id)
return self.client.upload(path, server)
def get_tests(self, devices):
......
server/server.py
浏览文件 @ 837e6488
......@@ -40,17 +40,17 @@ dir_files = os.path.join(dir_server, 'files')
@app.errorhandler(400)
def bad_request():
def bad_request(e):
return render_template('error.html', error='400 - Bad Request'), 400
@app.errorhandler(404)
def page_not_found():
def page_not_found(e):
return render_template('error.html', error='404 - Page Not Found'), 404
@app.errorhandler(500)
def internal_server_error():
def internal_server_error(e):
return render_template('error.html', error='500 - Internal Server Error'), 500
......@@ -65,15 +65,15 @@ def get_results():
for host in next(os.walk(dir_results))[1]:
dir_host = os.path.join(dir_results, host)
results[host] = {}
for cert_id in next(os.walk(dir_host))[1]:
dir_id = os.path.join(dir_host, cert_id)
for oec_id in next(os.walk(dir_host))[1]:
dir_id = os.path.join(dir_host, oec_id)
results[host][id] = next(os.walk(dir_id))[1]
return render_template('results.html', results=results)
@app.route('/results/<host>/<id>/<job>')
def get_job(host, cert_id, job):
dir_job = os.path.join(dir_results, host, cert_id, job)
def get_job(host, oec_id, job):
dir_job = os.path.join(dir_results, host, oec_id, job)
json_info = os.path.join(dir_job, 'compatibility.json')
json_results = os.path.join(dir_job, 'factory.json')
try:
......@@ -83,12 +83,12 @@ def get_job(host, cert_id, job):
results = json.load(f)
except (IOError, json.decoder.JSONDecodeError) as e:
abort(404)
return render_template('job.html', host=host, id=cert_id, job=job, info=info, results=results)
return render_template('job.html', host=host, id=oec_id, job=job, info=info, results=results)
@app.route('/results/<host>/<id>/<job>/devices/<interface>')
def get_device(host, cert_id, job, interface):
dir_job = os.path.join(dir_results, host, cert_id, job)
def get_device(host, oec_id, job, interface):
dir_job = os.path.join(dir_results, host, oec_id, job)
json_results = os.path.join(dir_job, 'factory.json')
try:
with open(json_results, 'r') as f:
......@@ -104,8 +104,8 @@ def get_device(host, cert_id, job, interface):
@app.route('/results/<host>/<id>/<job>/devices')
def get_devices(host, cert_id, job):
dir_job = os.path.join(dir_results, host, cert_id, job)
def get_devices(host, oec_id, job):
dir_job = os.path.join(dir_results, host, oec_id, job)
json_devices = os.path.join(dir_job, 'device.json')
try:
with open(json_devices, 'r') as f:
......@@ -116,8 +116,8 @@ def get_devices(host, cert_id, job):
@app.route('/results/<host>/<id>/<job>/attachment')
def get_attachment(host, cert_id, job):
dir_job = os.path.join(dir_results, host, cert_id, job)
def get_attachment(host, oec_id, job):
dir_job = os.path.join(dir_results, host, oec_id, job)
attachment = dir_job + '.tar.gz'
filedir = os.path.dirname(attachment)
filename = os.path.basename(attachment)
......@@ -125,8 +125,8 @@ def get_attachment(host, cert_id, job):
@app.route('/results/<host>/<id>/<job>/logs/<name>')
def get_log(host, cert_id, job, name):
dir_job = os.path.join(dir_results, host, cert_id, job)
def get_log(host, oec_id, job, name):
dir_job = os.path.join(dir_results, host, oec_id, job)
logpath = os.path.join(dir_job, name + '.log')
if not os.path.exists(logpath):
logpath = os.path.join(dir_job, 'job.log')
......@@ -139,8 +139,8 @@ def get_log(host, cert_id, job, name):
@app.route('/results/<host>/<id>/<job>/submit')
def submit(host, cert_id, job):
dir_job = os.path.join(dir_results, host, cert_id, job)
def submit(host, oec_id, job):
dir_job = os.path.join(dir_results, host, oec_id, job)
tar_job = dir_job + '.tar.gz'
json_cert = os.path.join(dir_job, 'compatibility.json')
try:
......@@ -181,14 +181,14 @@ def submit(host, cert_id, job):
@app.route('/api/job/upload', methods=['GET', 'POST'])
def upload_job():
host = request.values.get('host', '').strip().replace(' ', '-')
cert_id = request.values.get('id', '').strip().replace(' ', '-')
oec_id = request.values.get('id', '').strip().replace(' ', '-')
job = request.values.get('job', '').strip().replace(' ', '-')
filetext = request.values.get('filetext', '')
if not(all([host, cert_id, job, filetext])):
return render_template('upload.html', host=host, id=cert_id, job=job,
if not(all([host, oec_id, job, filetext])):
return render_template('upload.html', host=host, id=id, job=job,
filetext=filetext, ret='Failed'), 400
dir_job = os.path.join(dir_results, host, cert_id, job)
dir_job = os.path.join(dir_results, host, oec_id, job)
tar_job = dir_job + '.tar.gz'
if not os.path.exists(dir_job):
os.makedirs(dir_job)
......@@ -199,7 +199,7 @@ def upload_job():
except (IOError, OSError) as e:
print(e)
abort(400)
return render_template('upload.html', host=host, id=cert_id, job=job,
return render_template('upload.html', host=host, id=oec_id, job=job,
filetext=filetext, ret='Successful')
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或