From 876ee0616cd884633d9bcaa6d5183425da39682a Mon Sep 17 00:00:00 2001 From: "zhifeng.jiang" Date: Mon, 13 Jun 2016 13:18:55 +0800 Subject: Fix the pep8 error in qtip.py and validate_yaml.py JIRA:QTIP-89 Change-Id: Ifd760f74601dbc3e4d4c55108ed60a634f33cf49 Signed-off-by: zhifeng.jiang --- func/validate_yaml.py | 60 ++++++++++++++++++++++++--------------------------- qtip.py | 46 +++++++++++++++++++-------------------- 2 files changed, 50 insertions(+), 56 deletions(-) diff --git a/func/validate_yaml.py b/func/validate_yaml.py index e4d3d5cf..fcf32a21 100644 --- a/func/validate_yaml.py +++ b/func/validate_yaml.py @@ -1,32 +1,28 @@ -############################################################################## -# Copyright (c) 2015 Dell Inc and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - - - -import yaml -import os - - -class Validate_Yaml(): - - def __init__(self, doc): - - print 'Validating YAML CONFIG FILE' - - if not doc['Scenario']: - print '\nScenario Field missing\n' - if not doc['Scenario']['benchmark']: - print '\nBenchmark field missing' - if not doc['Scenario']['pointless']: - print '' - if not doc['Context']: - print '\nEntire Context is missing' - if not doc['Context']['Host_Machine']: - print '\nNo Host Machine' - if not doc['Context']['Host_Machine']['machine_1'] +############################################################################## +# Copyright (c) 2015 Dell Inc and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + + +class Validate_Yaml(object): + + def __init__(self, doc): + + print('Validating YAML CONFIG FILE') + + if not doc['Scenario']: + print('\nScenario Field missing\na') + if not doc['Scenario']['benchmark']: + print('\nBenchmark field missing') + if not doc['Scenario']['pointless']: + print('') + if not doc['Context']: + print('\nEntire Context is missing') + if not doc['Context']['Host_Machine']: + print('\nNo Host Machine') + if not doc['Context']['Host_Machine']['machine_1']: + print('\nNo Host Machine') diff --git a/qtip.py b/qtip.py index befbc23d..f95bb707 100644 --- a/qtip.py +++ b/qtip.py @@ -1,24 +1,22 @@ -############################################################################## -# Copyright (c) 2015 Dell Inc and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - - - -from func.cli import cli -import os - -def main(): - os.system('./data/file_permission.sh') - Objcli = cli() -# os.system('cd data/ref_results && python compute_suite.py') -# os.system('cd data/ref_results && python storage_suite.py') -# os.system('cd data/ref_results && python network_suite.py') -# os.system('cd data/report && python Qtip_Report.py') - -if __name__ == "__main__": - main() +############################################################################## +# Copyright (c) 2015 Dell Inc and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +from func.cli import cli +import os + + +def main(): + os.system('./data/file_permission.sh') + cli() +# os.system('cd data/ref_results && python compute_suite.py') +# os.system('cd data/ref_results && python storage_suite.py') +# os.system('cd data/ref_results && python network_suite.py') +# os.system('cd data/report && python Qtip_Report.py') + +if __name__ == "__main__": + main() -- cgit 1.2.3-korg