Remove the yardstick_tag and functest_tag

These 2 commands can't work now.
Also there is no need to support them, so remove them.

JIRA: DOVETAIL-695

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

diff --git a/dovetail/run.py b/dovetail/run.py
index 4f64375..b57f9ee 100755 (executable)
--- a/dovetail/run.py
+++ b/dovetail/run.py
@@ -74,28 +74,6 @@ def run_test(testcase_list, logger):
     return duration
 
 
-def validate_input(input_dict, check_dict, logger):
-    func_tag = input_dict['functest_tag']
-    yard_tag = input_dict['yardstick_tag']
-    # bott_tag = input_dict['bott_tag']
-    valid_functest_tags = check_dict['valid_functest_tags']
-    valid_yardstick_tags = check_dict['valid_yardstick_tags']
-    if func_tag is not None and func_tag not in valid_functest_tags:
-        logger.error("The input option 'functest_tag' can't be '{}', "
-                     "valid values are {}.".format(func_tag,
-                                                   valid_functest_tags))
-        raise SystemExit(EXIT_RUN_FAILED)
-    if yard_tag is not None and yard_tag not in valid_yardstick_tags:
-        logger.error("The input option 'yardstick_tag' can't be '{}', "
-                     "valid values are {}.".format(yard_tag,
-                                                   valid_yardstick_tags))
-        raise SystemExit(EXIT_RUN_FAILED)
-    # if bott_tag is not None and bott_tag not in valid_tag:
-    #     logger.error("The input option 'bott_tag' can't be {}, "
-    #                  "valid values are {}.".format(bott_tag, valid_tag))
-    #     raise SystemExit(1)
-
-
 def filter_config(input_dict, logger):
     cli_dict = dt_cfg.dovetail_config['cli']
     configs = {}
@@ -217,7 +195,6 @@ def check_hosts_file(logger):
 
 
 def parse_cli(logger=None, **kwargs):
-    validate_input(kwargs, dt_cfg.dovetail_config['validate_input'], logger)
     configs = filter_config(kwargs, logger)
     if configs is not None:
         dt_cfg.update_config(configs)

diff --git a/etc/conf/cmd_config.yml b/etc/conf/cmd_config.yml
index 3bfce46..76a4d61 100644 (file)
--- a/etc/conf/cmd_config.yml
+++ b/etc/conf/cmd_config.yml
@@ -15,34 +15,6 @@ cli:
 
   options:
     config:
-      yard_tag:
-        flags:
-          - '--yardstick_tag'
-          - '-y'
-        path:
-          - 'yardstick/docker_tag'
-        help: 'Overwrite tag for yardstick docker container (e.g. opnfv-5.1.0)'
-      func_tag:
-        flags:
-          - '--functest_tag'
-          - '-f'
-        path:
-          - 'functest/docker_tag'
-        help: 'Overwrite tag for functest docker container (e.g. euphrates)'
-      bott_tag:
-        flags:
-          - '--bottlenecks_tag'
-          - '-b'
-        path:
-          - 'bottlenecks/docker_tag'
-        help: 'Overwrite tag for bottlenecks docker container (e.g. stable)'
-      vnf_tag:
-        flags:
-          - '--vnf_tag'
-          - '-v'
-        path:
-          - 'vnftest/docker_tag'
-        help: 'Overwrite tag for vnftest docker container (e.g. beijing.0)'
     control:
       testsuite:
         flags:

diff --git a/etc/conf/dovetail_config.yml b/etc/conf/dovetail_config.yml
index 8722e39..8394445 100644 (file)
--- a/etc/conf/dovetail_config.yml
+++ b/etc/conf/dovetail_config.yml
@@ -91,14 +91,6 @@ test_project:
   - 'bottlenecks'
   - 'vnftest'
 
-validate_input:
-  valid_functest_tags:
-    - 'latest'
-    - 'euphrates'
-  valid_yardstick_tags:
-    - 'latest'
-    - 'opnfv-5.1.0'
-
 mandatory:
   - osinterop
   - ha