Modify utils/ code into PEP8 style

JIRA: BOTTLENECK-100

Modify all the code in the utils folder into PEP8 style.
Using more standard way to realize our function.

Change-Id: I965c507390adcb4404d33710f783b22241542890
Signed-off-by: liyin <liyin11@huawei.com>

diff --git a/utils/__init__.py b/utils/__init__.py
index 3872728..b124dfa 100644 (file)
--- a/utils/__init__.py
+++ b/utils/__init__.py
@@ -5,4 +5,4 @@
 # 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
 # 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

-##############################################################################
\ No newline at end of file
+##############################################################################

diff --git a/utils/dashboard/process_data.py b/utils/dashboard/process_data.py
index e71a1e8..6ca6ee1 100644 (file)
--- a/utils/dashboard/process_data.py
+++ b/utils/dashboard/process_data.py
@@ -8,14 +8,14 @@
 ##############################################################################
 
 
 ##############################################################################
 
 

-import subprocess as subp

 import sys
 from rubbos_collector import RubbosCollector
 from uploader import Uploader
 
 
 def printUsage():
 import sys
 from rubbos_collector import RubbosCollector
 from uploader import Uploader
 
 
 def printUsage():

-    print "Usage: python process_data.py required_params(**) optional_params([])"
+    print ("Usage: python process_data.py required_params(**)"
+          " optional_params([])")

     print "       ** -i|--input   input_data_dir"
     print "       ** -s|--suite   suite_name"
     print "       ** -c|--conf    conf_file"
     print "       ** -i|--input   input_data_dir"
     print "       ** -s|--suite   suite_name"
     print "       ** -c|--conf    conf_file"

diff --git a/utils/dashboard/rubbos_collector.py b/utils/dashboard/rubbos_collector.py
index d9f8603..140700e 100755 (executable)
--- a/utils/dashboard/rubbos_collector.py
+++ b/utils/dashboard/rubbos_collector.py
@@ -17,19 +17,27 @@ def exec_shell(cmd):
 
 
 def get_onetime_data(dir_name):
 
 
 def get_onetime_data(dir_name):

-    cmd = "grep -in 'remote client nodes' %s/index.html|awk '{print $5}'|awk -F '<' '{print $1}'" % dir_name
+    cmd = ("grep -in 'remote client nodes' %s/index.html|awk "
+           "'{print $5}'|awk -F '<' '{print $1}'" % dir_name)

     client_node_num = int(exec_shell(cmd))
     client_node_num = int(exec_shell(cmd))

-    cmd = "grep -n 'Number of clients' %s/index.html|awk '{print $5}'|awk -F '<' '{print $1}'" % dir_name
+    cmd = ("grep -n 'Number of clients' %s/index.html|awk "
+           "'{print $5}'|awk -F '<' '{print $1}'" % dir_name)

     each_client_num = int(exec_shell(cmd))
     total_client = (client_node_num + 1) * each_client_num
 
     each_client_num = int(exec_shell(cmd))
     total_client = (client_node_num + 1) * each_client_num
 

-    cmd = 'grep -n "throughput" %s/stat_client*.html |awk -F "<B>" \'{if (FNR%%2==0 && FNR%%4!=0) {printf "%%s\\n", $3}}\'|awk \'BEGIN{sum=0;}{sum=sum+$1;}END{print sum}\'' % dir_name
+    cmd = ('grep -n "throughput" %s/stat_client*.html |awk -F "<B>"'
+           ' \'{if (FNR%%2==0 && FNR%%4!=0) {printf "%%s\\n", $3}}\'|awk \''
+           'BEGIN{sum=0;}{sum=sum+$1;}END{print sum}\'' % dir_name)

     throughput = int(exec_shell(cmd))
 
     throughput = int(exec_shell(cmd))
 

-    cmd = 'grep -n "Total" %s/stat_client*.html |awk -F "<B>" \'{if (FNR==4) {printf "%%s\\n", $4}}\'|awk -F "</B>" \'BEGIN{sum=0;}{sum=sum+$1;}END{print sum}\'' % dir_name
+    cmd = ('grep -n "Total" %s/stat_client*.html |awk -F "<B>"'
+           ' \'{if (FNR==4) {printf "%%s\\n", $4}}\'|awk -F "</B>"'
+           ' \'BEGIN{sum=0;}{sum=sum+$1;}END{print sum}\'' % dir_name)

     request = int(exec_shell(cmd))
 
     request = int(exec_shell(cmd))
 

-    cmd = 'grep -n "Total" %s/stat_client*.html |awk -F "<B>" \'{if (FNR==4) {printf "%%s\\n", $5}}\'|awk -F "</B>" \'BEGIN{sum=0;}{sum=sum+$1;}END{print sum}\'' % dir_name
+    cmd = ('grep -n "Total" %s/stat_client*.html |awk -F "<B>"'
+           ' \'{if (FNR==4) {printf "%%s\\n", $5}}\'|awk -F "</B>"'
+           ' \'BEGIN{sum=0;}{sum=sum+$1;}END{print sum}\'' % dir_name)

     error_request = int(exec_shell(cmd))
 
     return total_client, throughput, request, error_request
     error_request = int(exec_shell(cmd))
 
     return total_client, throughput, request, error_request


@@ -44,8 +52,8 @@ class RubbosCollector(object):
         cmd = 'ls -l %s |grep ^d|awk \'{print $9}\'' % data_home
         result = []
         for subdir in exec_shell(cmd).split('\n'):
         cmd = 'ls -l %s |grep ^d|awk \'{print $9}\'' % data_home
         result = []
         for subdir in exec_shell(cmd).split('\n'):

-            total_client, throughput, request, error_request = get_onetime_data(
-                data_home + '/' + subdir)
+            total_client, throughput, request, error_request = \
+                get_onetime_data(data_home + '/' + subdir)

             result.append({'client': total_client,
                            'throughput': throughput,
                            'request': request,
             result.append({'client': total_client,
                            'throughput': throughput,
                            'request': request,

diff --git a/utils/dashboard/uploader.py b/utils/dashboard/uploader.py
index a468656..97ffd38 100755 (executable)
--- a/utils/dashboard/uploader.py
+++ b/utils/dashboard/uploader.py
@@ -51,7 +51,8 @@ class Uploader(object):
 
 def _test():
 
 
 def _test():
 

-    #data = '{"details": [{"client": 200, "throughput": 20}, {"client": 300, "throughput": 20}], "case_name": "rubbos"}'
+    # data = '{"details": [{"client": 200, "throughput": 20},
+    # {"client": 300, "throughput": 20}], "case_name": "rubbos"}'

     if len(sys.argv) < 2:
         print ("no argumens input!!")
         exit(1)
     if len(sys.argv) < 2:
         print ("no argumens input!!")
         exit(1)


@@ -60,5 +61,6 @@ def _test():
         data = json.load(stream)
         Uploader().upload_result(data)
 
         data = json.load(stream)
         Uploader().upload_result(data)
 

+

 if __name__ == "__main__":
     _test()
 if __name__ == "__main__":
     _test()

diff --git a/utils/infra_setup/__init__.py b/utils/infra_setup/__init__.py
index 3872728..b124dfa 100644 (file)
--- a/utils/infra_setup/__init__.py
+++ b/utils/infra_setup/__init__.py
@@ -5,4 +5,4 @@
 # 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
 # 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

-##############################################################################
\ No newline at end of file
+##############################################################################

diff --git a/utils/infra_setup/heat/common.py b/utils/infra_setup/heat/common.py
index 28257ac..ab0dadf 100755 (executable)
--- a/utils/infra_setup/heat/common.py
+++ b/utils/infra_setup/heat/common.py
@@ -97,6 +97,7 @@ def get_heat_api_version():
         return api_version
     return DEFAULT_HEAT_API_VERSION
 
         return api_version
     return DEFAULT_HEAT_API_VERSION
 

+

 def get_nova_api_version():
     api_version = os.getenv('OS_COMPUTE_API_VERSION')
     if api_version is not None:
 def get_nova_api_version():
     api_version = os.getenv('OS_COMPUTE_API_VERSION')
     if api_version is not None:


@@ -110,4 +111,4 @@ def get_glance_api_version():
     if api_version is not None:
         log.info("GLANCE_API_VERSION is set in env as '%s'", api_version)
         return api_version
     if api_version is not None:
         log.info("GLANCE_API_VERSION is set in env as '%s'", api_version)
         return api_version

-    return DEFAULT_GLANCE_API_VERSION
\ No newline at end of file
+    return DEFAULT_GLANCE_API_VERSION

diff --git a/utils/infra_setup/heat/consts/parameters.py b/utils/infra_setup/heat/consts/parameters.py
index f275c25..15aa5b5 100755 (executable)
--- a/utils/infra_setup/heat/consts/parameters.py
+++ b/utils/infra_setup/heat/consts/parameters.py
@@ -7,7 +7,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 

-import files

 
 # ------------------------------------------------------
 # Directories and file locations
 
 # ------------------------------------------------------
 # Directories and file locations

diff --git a/utils/infra_setup/heat/template.py b/utils/infra_setup/heat/template.py
index 28c20b7..cc652fb 100755 (executable)
--- a/utils/infra_setup/heat/template.py
+++ b/utils/infra_setup/heat/template.py
@@ -114,9 +114,9 @@ class HeatStack(HeatObject):
             i += 1
 
         if self.uuid is not None:
             i += 1
 
         if self.uuid is not None:

-           sys.exit("delete stack failed!!!")
+            sys.exit("delete stack failed!!!")

         else:
         else:

-           HeatStack.stacks.remove(self)
+            HeatStack.stacks.remove(self)

 
     @staticmethod
     def delete_all():
 
     @staticmethod
     def delete_all():