dovetail: modify process flow in function update_envs()

bugfix task DOVETAIL-144
1. If run command "python run.py" without options, e.g. --SUT_TYPE, --SUT_IP,
env values will be updated by os enviromental parameter.
2. If run command "python run.py" with options, no update from os enviromental
parameter.

JIRA: DOVETAIL-144

Change-Id: Id3bde7546722a5f4defe52d4f00609d7049a288b
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>

diff --git a/dovetail/conf/dovetail_config.py b/dovetail/conf/dovetail_config.py
index 8fa1a6d..9dcf5ff 100644 (file)
--- a/dovetail/conf/dovetail_config.py
+++ b/dovetail/conf/dovetail_config.py
@@ -47,9 +47,10 @@ class DovetailConfig:
     @classmethod
     def update_envs(cls, options):
         for item in options:
-            if options[item] is not None:
-                key = cls.cmd_name_trans(item)
-                os.environ[key] = options[item]
+            key = cls.cmd_name_trans(item)
+            if not options[item] and key in os.environ:
+                options[item] = os.environ[key]
+            if options[item]:
                 cls.update_config_envs('functest', key)
                 cls.update_config_envs('yardstick', key)