From 3cff5221e332c83d143a7150217513ca7f3e1ed1 Mon Sep 17 00:00:00 2001
From: zshi <zshi@redhat.com>
Date: Mon, 28 Nov 2016 11:00:35 +0800
Subject: dovetail tool: change CI_DEBUG to DEBUG

JIRA: DOVETAIL-42

1) change 'CI_DEBUG' to 'DEBUG' in cmd_config.yml
   and dovetail_logger.py
2) assign 'DEBUG' env value to 'CI_DEBUG' when
   updating functest and yardstick parameter 'envs'

Change-Id: I6d6130e394fddf11d83be619f2c9684bf8c859f9
Signed-off-by: zshi <zshi@redhat.com>
---
 dovetail/conf/cmd_config.yml      | 6 +++---
 dovetail/conf/dovetail_config.py  | 2 ++
 dovetail/utils/dovetail_logger.py | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dovetail/conf/cmd_config.yml b/dovetail/conf/cmd_config.yml
index c2108c58..2d51f88d 100644
--- a/dovetail/conf/cmd_config.yml
+++ b/dovetail/conf/cmd_config.yml
@@ -31,11 +31,11 @@ cli:
           - '--DEPLOY_TYPE'
           - '-T'
         help: 'DEPLOY_TYPE of the system under test (SUT).'
-      CI_DEBUG:
+      DEBUG:
         flags:
-          - '--CI_DEBUG'
+          - '--DEBUG'
           - '-d'
-        help: 'CI_DEBUG for showing debug log.'
+        help: 'DEBUG for showing debug log.'
     non-envs:
       scenario:
         flags:
diff --git a/dovetail/conf/dovetail_config.py b/dovetail/conf/dovetail_config.py
index 5ac23c43..597c5e7d 100644
--- a/dovetail/conf/dovetail_config.py
+++ b/dovetail/conf/dovetail_config.py
@@ -52,6 +52,8 @@ class DovetailConfig:
 
     @classmethod
     def update_config_envs(cls, script_type, key):
+        if key == 'DEBUG':
+            os.environ['CI_DEBUG'] = os.environ[key]
         envs = cls.dovetail_config[script_type]['envs']
         old_value = re.findall(r'\s+%s=(.*?)(\s+|$)' % key, envs)
         if old_value == []:
diff --git a/dovetail/utils/dovetail_logger.py b/dovetail/utils/dovetail_logger.py
index 6a2d38d5..e725e612 100644
--- a/dovetail/utils/dovetail_logger.py
+++ b/dovetail/utils/dovetail_logger.py
@@ -40,7 +40,7 @@ clean_results_dir()
 class Logger:
     def __init__(self, logger_name):
 
-        CI_DEBUG = os.getenv('CI_DEBUG')
+        DEBUG = os.getenv('DEBUG')
 
         self.logger = logging.getLogger(logger_name)
         self.logger.propagate = 0
@@ -50,7 +50,7 @@ class Logger:
         formatter = logging.Formatter('%(asctime)s - %(name)s - '
                                       '%(levelname)s - %(message)s')
         ch.setFormatter(formatter)
-        if CI_DEBUG is not None and CI_DEBUG.lower() == "true":
+        if DEBUG is not None and DEBUG.lower() == "true":
             ch.setLevel(logging.DEBUG)
         else:
             ch.setLevel(logging.INFO)
-- 
cgit 1.2.3-korg