From: xudan Date: Thu, 10 Nov 2016 07:30:15 +0000 (+0000) Subject: dovetail tool: reorganize prepare_env.py X-Git-Tag: ovp.0.9.0~292^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F61%2F24161%2F3;p=dovetail.git dovetail tool: reorganize prepare_env.py 1. add main function and move statements into it JIRA: DOVETAIL-57 Change-Id: I69158fa64ffc10668fc39835de434f0b44b8754a Signed-off-by: xudan --- diff --git a/dovetail/prepare_env.py b/dovetail/prepare_env.py index 7573fb6e..9cf0f4f0 100644 --- a/dovetail/prepare_env.py +++ b/dovetail/prepare_env.py @@ -8,6 +8,7 @@ # import platform + import utils.dovetail_logger as dt_logger import utils.dovetail_utils as dt_utils @@ -48,12 +49,19 @@ def get_docker_pkgname(os): else: return None -logger = dt_logger.Logger('prepare_env.py').getLogger() -os_name = get_os_lower() -cmd = "sudo %s -y install %s python-pip" \ - % (get_install_bin(os_name), get_docker_pkgname(os_name)) -dt_utils.exec_cmd(cmd, logger) +def main(): + """Dovetail prepare env main""" + logger = dt_logger.Logger('prepare_env.py').getLogger() + + os_name = get_os_lower() + cmd = "sudo %s -y install %s python-pip" \ + % (get_install_bin(os_name), get_docker_pkgname(os_name)) + dt_utils.exec_cmd(cmd, logger) + + cmd = "sudo pip install click pyyaml jinja2" + dt_utils.exec_cmd(cmd, logger) + -cmd = "sudo pip install click pyyaml jinja2" -dt_utils.exec_cmd(cmd, logger) +if __name__ == '__main__': + main()