pep8 cleanup

Author: tvoran

automaton.py

@@ -21,6 +21,7 @@ def __init__(self, config, clusters):
         Thread.__init__(self)
         self.config = config
         self.clusters = clusters
+
     def run(self):
         LOG.info("Starting Automaton")
         #TODO(pdmars): do something
@@ -47,7 +48,7 @@ def run(self):
                 cluster.launch()
             if self.config.options.terminate_cluster:
                 cluster.connect()
-                if self.config.options.terminate_cluster=="all":
+                if self.config.options.terminate_cluster == "all":
                     cluster.terminate_all()
                 else:
                     cluster.terminate(self.config.options.terminate_cluster)
@@ -60,20 +61,22 @@ def run(self):
             if self.config.options.excute_benchmarks:
                 cluster.connect()
                 cluster.excute_benchmarks()
-            
+
+
 def clean_exit(signum, frame):
     global SIGEXIT
     SIGEXIT = True
     LOG.critical("Exit signal received. Exiting at the next sane time. "
                  "Please stand by.")
 
+
 def main():
     (options, args) = parse_options()
     configure_logging(options.debug)
-    
+
     config = Config(options)
     clusters = Clusters(config)
-    
+
     signal.signal(signal.SIGINT, clean_exit)
     automaton = Automaton(config, clusters)
     automaton.start()
@@ -83,4 +86,4 @@ def main():
         automaton.join(timeout=1.0)
 
 if __name__ == "__main__":
-    main()
+    main()

deployment/common.py

@@ -6,6 +6,7 @@
 
 from lib import util
 
+
 def get_run_levels(dir_path):
     """Return sorted list of directory content
 
@@ -21,7 +22,8 @@ def get_run_levels(dir_path):
         for item in folder_contents:
             item_first_chr = item.split("-")[0]
             try:
-                if os.path.isdir(os.path.join(dir_path,item)) and item_first_chr.isdigit():
+                if os.path.isdir(os.path.join(dir_path, item)) and \
+                   item_first_chr.isdigit():
                     contents.append(item)
             except:
                 continue
@@ -30,10 +32,12 @@ def get_run_levels(dir_path):
     except OSError:
         return False
 
+
 def get_executable_files(run_level_dir):
     """get executable files from a directory
 
-    Given a directory, walk into it and return absolute path of files that are executable
+    Given a directory, walk into it and return absolute path of files
+    that are executable
 
     Args:
         run_level_dir ( string ) : directory path
@@ -45,25 +49,27 @@ def get_executable_files(run_level_dir):
     scripts_list = []
     for root, dirs, files in os.walk(run_level_dir):
         for afile in files:
-            file_abs_path = os.path.join(root,afile)
+            file_abs_path = os.path.join(root, afile)
             if util.is_executable_file(file_abs_path):
-                scripts_list.append(os.path.join(root,afile))
+                scripts_list.append(os.path.join(root, afile))
     return scripts_list
 
 
 def get_stages(mode, levels_dir, remote_dir=""):
-    """ Get the stages of execution in a dict format
+    """Get the stages of execution in a dict format
 
-    Given a root directory of the stages, loop over those levels and extract all executable scripts
-    based on given mode, i.e : client or server.
+    Given a root directory of the stages, loop over those levels and
+    extract all executable scripts based on given mode, i.e : client
+    or server.
 
     Args:
         mode (string) : client or server
         levels_dir (string) : deployment stage root dir
 
     return:
-        stages_dict (dict) : every key represent an execution level, the value of that key is list of all
-        executable scripts in that level.
+        stages_dict (dict) : every key represent an execution level,
+        the value of that key is list of all executable scripts in
+        that level.
 
     """
     stages_dict = {}
@@ -80,6 +86,7 @@ def get_stages(mode, levels_dir, remote_dir=""):
                 stages_dict[level] = get_executable_files(abs_path_w_mode)
 
     for key, value in stages_dict.iteritems():
-        stages_dict[key] = [ x.replace(levels_dir,remote_dir,1) for x in value ]
+        stages_dict[key] = [x.replace(levels_dir, remote_dir, 1)
+                            for x in value]
 
-    return stages_dict
+    return stages_dict

deployment/engine.py

@@ -3,6 +3,7 @@
 order of execution
 """
 
+
 class StagedDeploymentEngine(object):
 
     def __init__(self):

deployment/executor.py

@@ -18,9 +18,11 @@ def execute_one_level(self, run_level):
         cmds_in_run_level = self.staged_dict[run_level]
 
         for command in cmds_in_run_level:
-            remote_command = util.RemoteCommand(self.hostname, self.private_key, command)
+            remote_command = util.RemoteCommand(self.hostname,
+                                                self.private_key, command)
             return_code = remote_command.execute()
-            result_dict[command] = (return_code, remote_command.stdout, remote_command.stderr)
+            result_dict[command] = (return_code, remote_command.stdout,
+                                    remote_command.stderr)
 
             if return_code != 0:
                 break

etc/global.conf

@@ -1,6 +1,6 @@
 [DEFAULT]
 key_name = automaton
-key_path = /Users/suiyuan0226/.ssh/id_rsa.pub
+key_path = /Users/voran/.ssh/id_rsa.pub
 ssh_priv_key = /Users/suiyuan0226/.ssh/automaton.pem
 git_repo_home = /home/staged-deployment-scripts
 git_repo_location = https://github.com/alal3177/staged-deployment-scripts.git

examples/engine.py

@@ -1,6 +1,7 @@
-"""
-This entire file is just an example to demonstrate functionality of staged deployment.
-We will implement the execution workflow here when we have more time.
+"""This entire file is just an example to demonstrate functionality
+of staged deployment.  We will implement the execution workflow here
+when we have more time.
+
 """
 
 import shutil
@@ -13,38 +14,39 @@
 config_file = "../etc/global.conf"
 
 # clone the repo locally
-my_local_folder = util.clone_git_repo(util.read_config(config_file).get("DEFAULT","git_repo_location"))
+git_repo_location = util.read_config(config_file).get("DEFAULT",
+                                                      "git_repo_location")
+my_local_folder = util.clone_git_repo(git_repo_location)
 
 # we fill a dict with our stages
-stages = common.get_stages("client", my_local_folder, util.read_config(config_file).get("DEFAULT","git_repo_home"))
-
+git_repo_home = util.read_config(config_file).get("DEFAULT", "git_repo_home")
+stages = common.get_stages("client", my_local_folder, git_repo_home)
 
 # remove the directory since it is not needed anymore
-shutil.rmtree(my_local_folder,ignore_errors=True)
+shutil.rmtree(my_local_folder, ignore_errors=True)
 
 # clone the repo to the vm
-remote_clone_result = util.RemoteCommand("vm-148-120.uc.futuregrid.org",\
-    util.read_config(config_file).get("DEFAULT", "ssh_priv_key"),
-    "git clone %s %s" % (util.read_config(config_file).get("DEFAULT","git_repo_location") ,
-                         util.read_config(config_file).get("DEFAULT","git_repo_home"))).execute()
+ssh_priv_key = util.read_config(config_file).get("DEFAULT", "ssh_priv_key")
+cmd = "git clone %s %s" % (git_repo_location, git_repo_home)
+remote_clone_result = util.RemoteCommand("vm-148-120.uc.futuregrid.org",
+                                         ssh_priv_key, cmd).execute()
 
 # initiate executor class with the stages
-exec_obj = Executor("vm-148-120.uc.futuregrid.org",
-    util.read_config(config_file).get("DEFAULT", "ssh_priv_key"),
-    stages)
+exec_obj = Executor("vm-148-120.uc.futuregrid.org", ssh_priv_key,
+                    stages)
 
-# loop over all available stages that has a script with execution bit set and execute it
-# if any of the commands at stage 0 failed for example, then we abort the execution and do not go
-# to next stage
+# loop over all available stages that has a script with execution bit
+# set and execute it. if any of the commands at stage 0 failed for
+# example, then we abort the execution and do not go to next stage
 
 abort = False
 for each_stage in stages:
     if not abort:
         all_commands_result = exec_obj.execute_one_level(each_stage)
-        print "done with %s and all commands results are : %s" % (each_stage, str(all_commands_result))
+        print "done with %s and all commands results are : %s" % \
+            (each_stage, str(all_commands_result))
         for command_result in all_commands_result:
-            result, stdout, stderr =  all_commands_result[command_result]
+            result, stdout, stderr = all_commands_result[command_result]
             if result != 0:
                 abort = True
                 break
-

graphing/graphing.py

@@ -2,8 +2,9 @@
 from parser import Parser
 from lib.util import read_path
 
+
 class Graph(object):
-    def __init__(self,config):
+    def __init__(self, config):
         self.config = config
         self.parser = Parser(self.config)
         self.graph_path = self.config.globals.graph_path
@@ -13,26 +14,26 @@ def __init__(self,config):
     def generate_graph(self):
         raw_data = self.parser.get_mean()
         for item in raw_data:
-            data=list()
+            data = list()
             for n in range(len(self.attributes)):
                 data.append(item[n+1])
-            figure_name = '%s/%s.png' % (self.graph_path,item[0])
-            figure = bar_graph(item[0],self.attributes,data,figure_name)
-            
+            figure_name = '%s/%s.png' % (self.graph_path, item[0])
+            figure = bar_graph(item[0], self.attributes, data, figure_name)
+
 
-def bar_graph(title,x_value,y_value,path):
+def bar_graph(title, x_value, y_value, path):
     fig = plt.figure()
-    ax = fig.add_subplot(1,1,1)
+    ax = fig.add_subplot(1, 1, 1)
     x = range(len(y_value))
 
-    rects = ax.bar(x, y_value, facecolor='#777777', edgecolor='black',align='center',yerr=0.1,width=0.5)
+    rects = ax.bar(x, y_value, facecolor='#777777', edgecolor='black',
+                   align='center', yerr=0.1, width=0.5)
     ax.set_title(title)
     ax.set_xticks(x)
     ax.set_xticklabels(x_value)
     for rect in rects:
         height = rect.get_height()
-        plt.text(rect.get_x()+rect.get_width()/4, 1.01*height, '%s' % float(height))
+        plt.text(rect.get_x()+rect.get_width()/4, 1.01*height, '%s' %
+                 float(height))
     #plt.show()
     fig.savefig(path)
- 
-