test pr

tools/kcli/kcli/execute/execute.py → tools/kcli/kcli/execute.py

@@ -1,3 +1,5 @@
+import argparse
+import sys
 from os import path
 
 import ansible.color
@@ -6,14 +8,17 @@
 import ansible.utils
 from ansible import callbacks
 
-from kcli import conf, exceptions
-from kcli.execute import core
+from kcli import conf, exceptions, utils
 
+VERBOSITY = 0
 HOSTS_FILE = "hosts"
 LOCAL_HOSTS = "local_hosts"
 PROVISION = "provision"
 PLAYBOOKS = [PROVISION, "install", "test", "collect-logs", "cleanup"]
 
+assert "playbooks" == path.basename(conf.PLAYBOOKS_DIR), \
+    "Bad path to playbooks"
+
 
 # ansible-playbook
 # https://github.com/ansible/ansible/blob/devel/bin/ansible-playbook
@@ -139,11 +144,31 @@ def ansible_wrapper(args):
 
     playbooks = [p for p in PLAYBOOKS if getattr(args, p, False)]
     if not playbooks:
-        core.parser.error("No playbook to execute (%s)" % PLAYBOOKS)
+        parser.error("No playbook to execute (%s)" % PLAYBOOKS)
 
     for playbook in (p for p in PLAYBOOKS if getattr(args, p, False)):
         print "Executing Playbook: %s" % playbook
         try:
             execute_ansible(playbook, args)
         except Exception:
             raise exceptions.IRPlaybookFailedException(playbook)
+
+
+def main():
+    args = parser.parse_args()
+    args.func(args)
+
+
+parser = argparse.ArgumentParser()
+parser.add_argument('-v', '--verbose', default=VERBOSITY, action="count",
+                    help="verbose mode (-vvv for more,"
+                         " -vvvv to enable connection debugging)")
+parser.add_argument("--settings",
+                    default=conf.KCLI_SETTINGS_YML,
+                    type=lambda file_path: utils.normalize_file(file_path),
+                    help="settings file to use. default: %s"
+                         % conf.KCLI_SETTINGS_YML)
+subparsers = parser.add_subparsers(metavar="COMMAND")
+
+if __name__ == '__main__':
+    sys.exit(main())

tools/kcli/kcli/main.py

@@ -8,7 +8,7 @@
 
 from kcli import conf
 from kcli import options as kcli_options
-from kcli.execute.execute import PLAYBOOKS
+from kcli.execute import PLAYBOOKS
 from kcli import parse
 from kcli import utils
 

tools/kcli/kcli/parse.py

@@ -1,7 +1,6 @@
 from argparse import ArgumentParser, RawTextHelpFormatter
 
-from execute.core import *
-from execute.execute import *
+from kcli import conf, execute, utils
 
 
 def create_parser(options_trees):
@@ -17,13 +16,14 @@ def create_parser(options_trees):
 
     execute_parser = sub_parsers.add_parser('execute')
     execute_parser.add_argument('-i', '--inventory', default=None,
-                                type=lambda x: core.file_exists(
-                                    execute_parser, x),
+                                type=lambda file_path: utils.normalize_file(
+                                    file_path),
                                 help="Inventory file to use. "
                                      "Default: {lcl}. "
                                      "NOTE: to reuse old environment use {"
                                      "host}".
-                                format(lcl=LOCAL_HOSTS, host=HOSTS_FILE))
+                                format(lcl=execute.LOCAL_HOSTS,
+                                       host=execute.HOSTS_FILE))
     execute_parser.add_argument("-v", "--verbose", help="verbosity",
                                 action='count', default=0)
     execute_parser.add_argument("--provision", action="store_true",
@@ -37,10 +37,11 @@ def create_parser(options_trees):
     execute_parser.add_argument("--cleanup", action="store_true",
                                 help="cleanup nodes")
     execute_parser.add_argument("--settings",
-                                type=lambda x: file_exists(parser, x),
+                                type=lambda file_path: utils.normalize_file(
+                                    file_path),
                                 help="settings file to use. default: %s"
                                      % conf.KCLI_SETTINGS_YML)
-    execute_parser.set_defaults(func=ansible_wrapper)
+    execute_parser.set_defaults(func=execute.ansible_wrapper)
     execute_parser.set_defaults(which='execute')
 
     for options_tree in options_trees: