Merge "Integrating PyTest contained in SNAPS as a replacement to the old bash healthc...

[functest.git] / functest / ci / prepare_env.py

diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py
index 45e19a4..b3e5902 100755 (executable)
--- a/functest/ci/prepare_env.py
+++ b/functest/ci/prepare_env.py
@@ -29,12 +29,6 @@ import functest.utils.openstack_utils as os_utils
 from functest.utils.constants import CONST
 
 actions = ['start', 'check']
-parser = argparse.ArgumentParser()
-parser.add_argument("action", help="Possible actions are: "
-                    "'{d[0]}|{d[1]}' ".format(d=actions))
-parser.add_argument("-d", "--debug", help="Debug mode", action="store_true")
-args = parser.parse_args()
-
 
 """ logging configuration """
 logger = ft_logger.Logger("prepare_env").getLogger()
@@ -48,6 +42,19 @@ with open(CONFIG_PATCH_PATH) as f:
     functest_patch_yaml = yaml.safe_load(f)
 
 
+class PrepareEnvParser():
+
+    def __init__(self):
+        self.parser = argparse.ArgumentParser()
+        self.parser.add_argument("action", help="Possible actions are: "
+                                 "'{d[0]}|{d[1]}' ".format(d=actions))
+        self.parser.add_argument("-d", "--debug", help="Debug mode",
+                                 action="store_true")
+
+    def parse_args(self, argv=[]):
+        return vars(self.parser.parse_args(argv))
+
+
 def print_separator():
     logger.info("==============================================")
 
@@ -177,11 +184,6 @@ def source_rc_file():
                 CONST.OS_TENANT_NAME = value
             elif key == 'OS_PASSWORD':
                 CONST.OS_PASSWORD = value
-    logger.debug("Used credentials: %s" % str)
-    logger.debug("OS_AUTH_URL:%s" % CONST.OS_AUTH_URL)
-    logger.debug("OS_USERNAME:%s" % CONST.OS_USERNAME)
-    logger.debug("OS_TENANT_NAME:%s" % CONST.OS_TENANT_NAME)
-    logger.debug("OS_PASSWORD:%s" % CONST.OS_PASSWORD)
 
 
 def patch_config_file():
@@ -259,6 +261,14 @@ def install_tempest():
                              error_msg="Problem while installing Tempest.")
 
 
+def create_flavor():
+    os_utils.get_or_create_flavor('m1.tiny',
+                                  '512',
+                                  '1',
+                                  '1',
+                                  public=True)
+
+
 def check_environment():
     msg_not_active = "The Functest environment is not installed."
     if not os.path.isfile(CONST.env_active):
@@ -274,12 +284,12 @@ def check_environment():
     logger.info("Functest environment is installed.")
 
 
-def main():
-    if not (args.action in actions):
+def main(**kwargs):
+    if not (kwargs['action'] in actions):
         logger.error('Argument not valid.')
         sys.exit()
 
-    if args.action == "start":
+    if kwargs['action'] == "start":
         logger.info("######### Preparing Functest environment #########\n")
         check_env_variables()
         create_directories()
@@ -288,17 +298,20 @@ def main():
         verify_deployment()
         install_rally()
         install_tempest()
+        create_flavor()
 
         with open(CONST.env_active, "w") as env_file:
             env_file.write("1")
 
         check_environment()
 
-    if args.action == "check":
+    if kwargs['action'] == "check":
         check_environment()
 
     exit(0)
 
 
 if __name__ == '__main__':
-    main()
+    parser = PrepareEnvParser()
+    args = parser.parse_args(sys.argv[1:])
+    main(**args)