dovetail tool: use command 'debug' to control both 'debug' and 'CON_DEBUG'

JIRA: DOVETAIL-167

Change-Id: Ieb35f6aa2a6868af7d6dad5727bb3b345709275a
Signed-off-by: xudan <xudan16@huawei.com>

diff --git a/dovetail/conf/cmd_config.yml b/dovetail/conf/cmd_config.yml
index 1c6418c..12c5935 100644 (file)
--- a/dovetail/conf/cmd_config.yml
+++ b/dovetail/conf/cmd_config.yml
@@ -30,14 +30,14 @@ cli:
           - 'functest/envs'
           - 'yardstick/envs'
         help: 'IP of the system under test (SUT).'
-      CON_DEBUG:
+      debug:
         flags:
-          - '--CON_DEBUG'
-          - '-c'
+          - '--debug'
+          - '-d'
         path:
           - 'functest/envs'
           - 'yardstick/envs'
-        help: 'True for showing debug log in functest/yardstick container.'
+        help: 'True for showing debug log on screen.'
       yard_tag:
         flags:
           - '--yard_tag'
@@ -69,8 +69,3 @@ cli:
           - '--testarea'
         default: 'full'
         help: 'compliance testarea within testsuite'
-      debug:
-        flags:
-          - '--debug'
-          - '-d'
-        help: 'True for showing debug log in screen.'

diff --git a/dovetail/utils/dovetail_config.py b/dovetail/utils/dovetail_config.py
index 33cf57b..7d2c164 100644 (file)
--- a/dovetail/utils/dovetail_config.py
+++ b/dovetail/utils/dovetail_config.py
@@ -19,7 +19,7 @@ class DovetailConfig:
     CMD_NAME_TRANS = {
         'SUT_TYPE': 'INSTALLER_TYPE',
         'SUT_IP': 'INSTALLER_IP',
-        'CON_DEBUG': 'CI_DEBUG',
+        'DEBUG': 'CI_DEBUG',
     }
 
     @classmethod